Skip to content

feature: added the map key (legend) to the my forest section #1645

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mohitb35 merged 5 commits into from
Feb 23, 2023
Merged

feature: added the map key (legend) to the my forest section #1645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1513df5
feature: added the map key to the my forest section
sunilsabatp Dec 20, 2022
1be2b2a
change the text
sunilsabatp Dec 21, 2022
0054796
refactor: cleaned up the code
sunilsabatp Jan 24, 2023
2abf0e1
refactor:clean up code
sunilsabatp Jan 25, 2023
5cad8eb
refactor:cleaned up css
sunilsabatp Jan 25, 2023
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
3 changes: 2 additions & 1 deletion public/static/locales/en/me.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,5 +247,6 @@
"apiKeyMessage2": "Once you generate an API Key, we will require a two factor authentication for your login. This you’ll be able to setup next time you log in.",
"apiKeyMessage3": "Regenerating an API Key will invalidate your existing API Key immediately.",
"regenerateKey": "Regenerate Key",
"giftFund": "GiftFund"
"giftFund": "GiftFund",
"donatedTrees": "Donated Trees"
}
16 changes: 13 additions & 3 deletions src/features/user/Profile/components/MyTrees/MyTrees.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { ReactElement } from 'react';
import React from 'react';
import styles from '../../styles/MyTrees.module.scss';
import dynamic from 'next/dynamic';
import {
Expand All @@ -23,7 +23,7 @@ interface Props {
}

export default function MyTrees({ profile, authenticatedType, token }: Props) {
const { t, i18n, ready } = useTranslation(['country', 'me']);
const { t, ready } = useTranslation(['country', 'me']);
const [contributions, setContributions] = React.useState();
const { handleError } = React.useContext(ErrorHandlingContext);

Expand Down Expand Up @@ -85,6 +85,16 @@ export default function MyTrees({ profile, authenticatedType, token }: Props) {
? t('me:myForest')
: t('me:nameForest', { name: profile.displayName })}
</div>
<div className={styles.MyTreesLegend}>
<div className={styles.donatedTrees}>
<TreesIcon color="currentColor" />
<p>{t('me:donatedTrees')}</p>
</div>
<div className={styles.registeredTrees}>
<TreesIcon color="currentColor" />
<p>{t('me:registeredTrees')}</p>
</div>
</div>
Comment thread
mohitb35 marked this conversation as resolved.
<div className={styles.myTreesContainer}>
<div className={styles.treesList}>
{contributions.map((contribution: any, index: any) => {
Expand All @@ -102,7 +112,7 @@ export default function MyTrees({ profile, authenticatedType, token }: Props) {

function TreeList({ contribution }: any) {
const date = formatDate(contribution.properties.plantDate);
const { t, i18n, ready } = useTranslation(['country', 'me']);
const { t, i18n } = useTranslation(['country', 'me']);

return (
<div key={contribution.properties.id} className={styles.tree}>
Expand Down
21 changes: 21 additions & 0 deletions src/features/user/Profile/styles/MyTrees.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,27 @@
font-family: $primaryFontFamily;
}


.registeredTrees {
color: #3d67b1;
}

.donatedTrees{
color: #68b030;
}

.MyTreesLegend {
display: flex;
gap: 14px;
padding-bottom: 10px;
div {
display: flex;
gap: 5px;
}
}



@include mdTabletView {
.myTreesSection {
height: 80vh;
Expand Down