diff --git a/components/CreateProfile/CreateProfileForm1.js b/components/CreateProfile/CreateProfileForm1.js index f8c3230f..10d53188 100644 --- a/components/CreateProfile/CreateProfileForm1.js +++ b/components/CreateProfile/CreateProfileForm1.js @@ -182,10 +182,6 @@ const CreateProfileQuestions1 = function ({ )) } -
+ {course?.courseId?.name} +
++ {course?.courseId?.description} +
++ {userPercentages} + % Completed + {' '} +
+$MINORITY Earned
++ $ + {parseInt(course.completionRate, 10) !== 100 + ? 0 + : course?.courseId?.earn} +
++ + {data.centerText.value} + + {data.centerText.text} + +
+ +{t}
+ +- Dashboard Overview (Desktop) +
+ Dashboard Overview
-- Dashboard Overview (Tablet) +
+ Dashboard Overview
-- Dashboard Overview (Mobile) +
+ Dashboard Overview
-{job?.companyId?.company_name}
-{job.job_title}
++ {job.job_title} + +
{job.job_type}
-@@ -223,17 +222,13 @@ const OverviewCareer = ({ token }) => { className="d-flex justify-content-center align-items-center" style={{ width: '100%' }} > - + + + Apply For Your First Job + +
- {course?.courseId?.name} -
-- {course?.courseId?.description} -
-- {course.completionRate} - % Completed - {' '} -
-$MINORITY Earned
-- $ - {parseInt(course.completionRate, 10) !== 100 - ? 0 - : course?.courseId?.earn} -
-+
Events
+
Upcoming
+
Events
+
Upcoming
+
Events
- {mentorInfo?.user_id?.firstName} - {' '} - {mentorInfo?.user_id?.lastName} -
-- Position +
+ {mentorInfo?.user_id?.firstName} + {' '} + {mentorInfo?.user_id?.lastName} +
++ {mentorInfo.occupation} +
++ Mentees
+4
+@@ -218,37 +229,28 @@ const OverviewComponent = ({ mentorInfo }) => ( style={{ fontSize: '12px', fontWeight: 400, - color: 'black', + color: '#DEDEDE', marginBottom: '2%', }} > Mentorship Start Date: 3rd March, 2021
-- Number of Mentees: - 4 -
+Washington, DC
Washington DC
- Chapter President: + Chapter President: Jason Cole
- Next Meeting: + Next Meeting: {' '} 24th Oct, 2021 @ 5:00pm EST
- Member Since: + Member Since: {' '} June 2021
+ + Chapter Settings +
Dog Walkr
@@ -52,12 +51,12 @@ const OverviewMyProposals = () => {
>
Scott Davis
@@ -82,7 +81,7 @@ const OverviewMyProposals = () => { style={{ fontSize: '18px', fontWeight: '700', - color: 'black', + color: 'white', margin: 0, marginRight: '5px', }} @@ -150,17 +149,19 @@ const OverviewMyProposals = () => { width: '100%', fontSize: '12px', margin: '0', + marginBottom: '10px', fontWeight: '700', - color: 'black', + color: 'white', padding: '0 10px', - height: '15%', + // height: '15%', }} > {/* 25% each */} -Name
-Status
-Created On
+Name
+Status
+Created On
{ const [loading, setLoading] = useState(true); const [currentView, setCurrentView] = useState('active'); - const [projectInfo, setProjectInfo] = useState(); - const [projectView, setProjectView] = useState('tasks'); + const [, setProjects] = useState([]); useEffect(() => { @@ -22,17 +20,6 @@ const OverviewProjects = ({ token }) => { }; }, []); - const params = { - slidesPerView: 3, - spaceBetween: 10, - freeMode: true, - - navigation: { - nextEl: '.swiper-button-next', - prevEl: '.swiper-button-prev', - }, - }; - useEffect(() => { if (token !== null) { axios @@ -58,225 +45,6 @@ const OverviewProjects = ({ token }) => { } }, []); - const dummyProjectData = [ - { - projectId: 0, - projectName: 'Project 1', - tasks: ['Task 1', 'Task 2', 'Task 3', 'Task 4', 'Task 5'], - description: - "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.", - thumbnail: - 'https://s3-alpha-sig.figma.com/img/2951/2f25/2b8152ce226e7158420ad0a7b66997d4?Expires=1639353600&Signature=NiizBF7u5Vtyxcfg5btRtH4C-ePB4viFrZKIybvsu3pX0XLxRUcrjsWZ3MRqxoWx-Fog3WBDDVu3YEpWFBoW94-qRPO1bw-p3HtsvQxzABiiV-xCzykUw1nGfYgnrPXe8y74KKC48RXpEDCjcsSeH8A5N-hpxiDOJRlDuDVUn40ntcr08waIZkzkSOJmPvB~83avTh6WvaqP~5EqdzX6NTdozn5mLycvIckur-svzdogNWrP7z3jyDHO-TnvlvOCEjhr5V7k2ABClP~wn2uUIQ91gS7ns8gbjfmBGdD6RCay75S2YXLHMZILNrpDWhkadsip9doD6ierKoC5rre-Lg__&Key-Pair-Id=APKAINTVSUGEWH5XD5UA', - }, - { - projectId: 1, - projectName: 'Project 2', - tasks: ['Task 1', 'Task 2', 'Task 3', 'Task 4', 'Task 5'], - description: - "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.", - thumbnail: - 'https://s3-alpha-sig.figma.com/img/95eb/9b0c/a4581433c385cef18426f59f409d4c42?Expires=1639353600&Signature=WVRXJhwJf8kXF3mj175FXXCoP5uk34jvKvcNfb-QT45lR--AKyHoz8SMj2Z-coi7Z0ZY6JYor3gFh3yVdPxudv-4ABwOHpQaNawol2ZWkFbtAyyAvzqI7oCRUK19DgnddOZchW8PECc8vnJg-Dm~e0nZ~dBwYSZd6RkKrdBBdyI66YRojG7A6hwAU4IkUofDTcxotSX56UG8-r5q0FAIV4GBywFW2eyZt24cKGD7t7SaeFq6vTm2sXOT2zjbgIbo1kXHCN98BAITS7mgGIBklo79xZZG7dUJLvfGu0r81u2CmcwQBi2F~03MbG1ZuN9dcd3BU~1bAyfwpCOWVbvPXg__&Key-Pair-Id=APKAINTVSUGEWH5XD5UA', - }, - { - projectId: 2, - projectName: 'Project 3', - tasks: ['Task 1', 'Task 2', 'Task 3', 'Task 4', 'Task 5'], - description: - "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.", - thumbnail: - 'https://s3-alpha-sig.figma.com/img/534b/7f4e/d21bc3c0761a4d2cb72de7952521a8b6?Expires=1639353600&Signature=JL7FL9ra9p173rG~xW9ginqFax4tmcKHeZ8o-RB9o5paUh4gB3kV0alTlOkLvsEr~7O9YVtSCwIIfRiUCNBhHmGJU5Io1D5wLh~XlHSrcZjSTZo1SH2Y5fxpI7Nc0DILHUkmn3bQ8ymlU7wHV28mt~x6Js8Ejlij4hXcCGqQo1lf1hCct47h4OlkJxMZnSS4rcdv-2drcASfCxKxfi2llzjD7B-NpAgoPPr0LrQS~DA-9faBA3q0IwTI-OsvBtzQXVH1rOpO4DgJ6Wz8GmdGjgglZaTvV5XtMiRUAC5-ncDXL4-9rlTTjWWcCYjQDhnlsjdiPaKyVXB~lwUkarefvg__&Key-Pair-Id=APKAINTVSUGEWH5XD5UA', - }, - { - projectId: 3, - projectName: 'Project 4', - tasks: ['Task 1', 'Task 2', 'Task 3', 'Task 4', 'Task 5'], - description: - "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.", - thumbnail: - 'https://s3-alpha-sig.figma.com/img/2951/2f25/2b8152ce226e7158420ad0a7b66997d4?Expires=1639353600&Signature=NiizBF7u5Vtyxcfg5btRtH4C-ePB4viFrZKIybvsu3pX0XLxRUcrjsWZ3MRqxoWx-Fog3WBDDVu3YEpWFBoW94-qRPO1bw-p3HtsvQxzABiiV-xCzykUw1nGfYgnrPXe8y74KKC48RXpEDCjcsSeH8A5N-hpxiDOJRlDuDVUn40ntcr08waIZkzkSOJmPvB~83avTh6WvaqP~5EqdzX6NTdozn5mLycvIckur-svzdogNWrP7z3jyDHO-TnvlvOCEjhr5V7k2ABClP~wn2uUIQ91gS7ns8gbjfmBGdD6RCay75S2YXLHMZILNrpDWhkadsip9doD6ierKoC5rre-Lg__&Key-Pair-Id=APKAINTVSUGEWH5XD5UA', - }, - { - projectId: 4, - projectName: 'Project 5', - tasks: ['Task 1', 'Task 2', 'Task 3', 'Task 4', 'Task 5'], - description: - "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.", - thumbnail: - 'https://s3-alpha-sig.figma.com/img/95eb/9b0c/a4581433c385cef18426f59f409d4c42?Expires=1639353600&Signature=WVRXJhwJf8kXF3mj175FXXCoP5uk34jvKvcNfb-QT45lR--AKyHoz8SMj2Z-coi7Z0ZY6JYor3gFh3yVdPxudv-4ABwOHpQaNawol2ZWkFbtAyyAvzqI7oCRUK19DgnddOZchW8PECc8vnJg-Dm~e0nZ~dBwYSZd6RkKrdBBdyI66YRojG7A6hwAU4IkUofDTcxotSX56UG8-r5q0FAIV4GBywFW2eyZt24cKGD7t7SaeFq6vTm2sXOT2zjbgIbo1kXHCN98BAITS7mgGIBklo79xZZG7dUJLvfGu0r81u2CmcwQBi2F~03MbG1ZuN9dcd3BU~1bAyfwpCOWVbvPXg__&Key-Pair-Id=APKAINTVSUGEWH5XD5UA', - }, - { - projectId: 5, - projectName: 'Project 6', - tasks: ['Task 1', 'Task 2', 'Task 3', 'Task 4', 'Task 5'], - description: - "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.", - thumbnail: - 'https://s3-alpha-sig.figma.com/img/534b/7f4e/d21bc3c0761a4d2cb72de7952521a8b6?Expires=1639353600&Signature=JL7FL9ra9p173rG~xW9ginqFax4tmcKHeZ8o-RB9o5paUh4gB3kV0alTlOkLvsEr~7O9YVtSCwIIfRiUCNBhHmGJU5Io1D5wLh~XlHSrcZjSTZo1SH2Y5fxpI7Nc0DILHUkmn3bQ8ymlU7wHV28mt~x6Js8Ejlij4hXcCGqQo1lf1hCct47h4OlkJxMZnSS4rcdv-2drcASfCxKxfi2llzjD7B-NpAgoPPr0LrQS~DA-9faBA3q0IwTI-OsvBtzQXVH1rOpO4DgJ6Wz8GmdGjgglZaTvV5XtMiRUAC5-ncDXL4-9rlTTjWWcCYjQDhnlsjdiPaKyVXB~lwUkarefvg__&Key-Pair-Id=APKAINTVSUGEWH5XD5UA', - }, - ]; - const ProjectTaskCard = ({ data }) => { - const taskName = data; - return ( -
{taskName}
-- > -
- -- {project.projectName} - {' '} -
-Project Tasks
-Project Details
-- Select a Project to View Tasks -
- )} -- {projectInfo.description} -
- ) : ( -- Select a Project to View Tasks -
- )} -- {userData.firstName} - {' '} - {userData.lastName} -
-- Current Position -
- -- Welcome back, - {userData.firstName} -
-
- You’ve completed
-
- 30%
-
- of the tasks available on Minority Programmers Association.
-
- Complete task, earn crypto!
-
- 12 -
-- of 40 Completed Tasks -
-+ // Welcome back, + // {userData.firstName} + //
+ //
+ // You’ve completed
+ //
+ // 30%
+ //
+ // of the tasks available on Minority Programmers Association.
+ //
+ // Complete task, earn crypto!
+ //
+ // 12 + // of 40 task completed + + //
+ + //- Welcome back, - {userData.firstName} -
-
- You’ve completed
-
- 30%
-
- {' '}
- of the tasks available on Minority Programmers Association.
-
- Complete task, earn crypto!
-
+ Welcome back, + {userData.firstName} +
+
+ You’ve completed
+
+ {' '}
+ 30%
+ {' '}
+
+ of the tasks available on Minority Programmers Association.
+
+ Complete task, earn
+ {' '}
+
+ crypto!
+
+
+ 12 + of 40 task completed + +
+ +- 12 -
-- of 40 Completed Tasks -
-{
{startup.percentRaised}
@@ -182,12 +183,13 @@ const OverviewStartups = ({ userData, token }) => {
- >
+
+
- 12 -
-- {props.centerText} -
-- {props.title} -
-- Total Amount -
-- $ - {current[1]} -
++ Total Amount +
++ $ + {current[1]} +
++ + {' '} + 1.2m +
++ + {' '} + 0.1m +
+Monthly $MINORITY Earned @@ -93,20 +93,20 @@ const OverviewWallet = () => {
{ fontSize: '10px', margin: '0', fontWeight: '700', - color: 'black', + color: 'white', }} > MINORITY ($MINORITY) @@ -142,7 +142,7 @@ const OverviewWallet = () => { fontSize: '15px', margin: '0', fontWeight: '700', - color: 'black', + color: 'white', }} > $0 @@ -187,11 +187,11 @@ const OverviewWallet = () => { return (
{ Wallet
+ /> */} {loading ? (Monthly $MINORITY Earned @@ -306,18 +307,18 @@ const OverviewWallet = () => {
{taskName}
++ {project.projectName} + {' '} +
+Project Tasks
+Project Details
++ Select a Project to View Tasks +
+ )} ++ {projectInfo.description} +
+ ) : ( ++ Select a Project to View Tasks +
+ )} +Host an Event
@@ -51,25 +49,22 @@ const TaskCard = () => ( {/* Third and Fourth Column */}
- EARN 15
-
- $MINORITY
+
+ EARN 15 $MINORITY
+
Currency Balances
@@ -78,7 +78,7 @@ const CoinsLegend = ({ walletInfo }) => ( > {/* first column name and symbol */}{ownedCoin.name}
+{ownedCoin.name}
{ownedCoin.symbol}
{coinInfo.name}
+{coinInfo.name}
{coinInfo.symbol}
Market Chart diff --git a/components/dashboard/wallet/TransactionCard.js b/components/dashboard/wallet/TransactionCard.js index e73374a3..7cddb6e9 100644 --- a/components/dashboard/wallet/TransactionCard.js +++ b/components/dashboard/wallet/TransactionCard.js @@ -41,7 +41,7 @@ const TransactionCard = ({ info }) => { {/* Transaction basic info */}
{transactionInfo.type.charAt(0).toUpperCase() + transactionInfo.type.slice(1)}
+{transactionInfo.type.charAt(0).toUpperCase() + transactionInfo.type.slice(1)}
Metamask Wallet
Trends
+Trends