Skip to content

Commit

Permalink
Merge pull request #2054 from Plant-for-the-Planet-org/feature/new_he…
Browse files Browse the repository at this point in the history
…ader

refactor navbar and minor change in styling
  • Loading branch information
mariahosfeld authored Aug 8, 2024
2 parents 78bc187 + d421756 commit a673e59
Show file tree
Hide file tree
Showing 38 changed files with 1,049 additions and 845 deletions.
96 changes: 78 additions & 18 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"@mui/x-date-pickers": "^5.0.15",
"@netlify/plugin-nextjs": "^4.33.0",
"@next/bundle-analyzer": "^10.2.3",
"@planet-sdk/common": "^0.1.37",
"@planet-sdk/common": "^0.1.39",
"@prisma/client": "^4.13.0",
"@sentry/browser": "^6.15.0",
"@sentry/integrations": "^6.19.2",
Expand Down
6 changes: 5 additions & 1 deletion pages/sites/[slug]/[locale]/home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,11 @@ export default function Home({ pageProps }: Props) {
loadLeaderboard();
}, []);

if (!pageProps.tenantConfig.config.header.items['home'].visible) {
if (
!pageProps.tenantConfig.config.header.items.find(
(item) => item.headerKey === 'home' && item.visible
)
) {
if (typeof window !== 'undefined') {
router.push('/');
}
Expand Down
22 changes: 22 additions & 0 deletions public/assets/images/icons/headerIcons/DefaultProfileImageIcon.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
const DefaultProfileImageIcon = () => {
return (
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 50 51" fill="none">
<circle
cx="25"
cy="25.48"
r="24"
fill="#DFF4E8"
stroke="white"
strokeWidth="2"
/>
<path
fillRule="evenodd"
clipRule="evenodd"
d="M33.1687 21.21C33.1687 21.21 31.6912 21.2838 31.3586 22.7545C31.3586 22.7545 31.3536 18.4209 28.0428 16.011C28.0428 16.011 27.0751 16.7683 27.0947 18.3445C27.0947 18.3445 24.3105 15.2284 18.3362 13.6773C16.6771 19.6797 17.9989 23.596 17.9989 23.596C16.6436 22.7909 15.5039 23.2503 15.5039 23.2503C15.9364 27.3221 19.6862 29.4936 19.6862 29.4936C18.2461 29.0463 17.4435 30.289 17.4435 30.289C21.0203 34.9542 25.9091 35.6046 29.4741 33.761C29.7086 33.6396 29.9379 33.5073 30.1603 33.3648C33.5394 31.1993 35.421 26.641 33.1687 21.21ZM29.4741 33.761L27.9294 31.0856L23.3526 30.6261L23.444 29.8492L27.4478 30.2514L25.234 26.4169L20.6572 25.9574L20.7482 25.1798L24.752 25.582L21.8702 20.5907L22.5564 20.1945L25.4381 25.1859L27.0917 21.5174L27.8107 21.8274L25.9202 26.0207L28.134 29.8553L29.7876 26.1868L30.5061 26.496L28.6156 30.6894L32.6004 37.5912L31.9142 37.9874L29.4741 33.761Z"
fill="#219653"
/>
</svg>
);
};

export default DefaultProfileImageIcon;
15 changes: 0 additions & 15 deletions public/assets/images/navigation/Donate.tsx

This file was deleted.

15 changes: 0 additions & 15 deletions public/assets/images/navigation/DonateSelected.tsx

This file was deleted.

15 changes: 0 additions & 15 deletions public/assets/images/navigation/Globe.tsx

This file was deleted.

15 changes: 0 additions & 15 deletions public/assets/images/navigation/GlobeSelected.tsx

This file was deleted.

24 changes: 0 additions & 24 deletions public/assets/images/navigation/HomeLogoSelected.tsx

This file was deleted.

29 changes: 0 additions & 29 deletions public/assets/images/navigation/HomoLogo.tsx

This file was deleted.

15 changes: 0 additions & 15 deletions public/assets/images/navigation/Leaderboard.tsx

This file was deleted.

15 changes: 0 additions & 15 deletions public/assets/images/navigation/LeaderboardSelected.tsx

This file was deleted.

15 changes: 0 additions & 15 deletions public/assets/images/navigation/Leaf.tsx

This file was deleted.

Loading

0 comments on commit a673e59

Please sign in to comment.