Merge branch 'platform-wide-redesign-knowledge-library' into platform…

…-wide-redesign-resource-view
akvo · Sep 12, 2023 · 1a223d4 · 1a223d4
2 parents ac83d63 + 3a76049
commit 1a223d4
Show file tree

Hide file tree

Showing 6 changed files with 295 additions and 322 deletions.
diff --git a/frontend/src/components/footer/footer.jsx b/frontend/src/components/footer/footer.jsx
@@ -4,7 +4,7 @@ import Link from 'next/link'
 import moment from 'moment'
 
 import styles from './style.module.scss'
-import { ArrowRight, FacebookIcon, LinkedinIcon, TwitterIcon } from '../icons'
+import { ArrowRight, LinkedinIcon, YoutubeIcon } from '../icons'
 import Button from '../button'
 
 const Footer = () => {
@@ -27,7 +27,7 @@ const Footer = () => {
  </a>
  </div>
  </div>
- <div className="footer-item">
+ {/* <div className="footer-item">
  <h6 className="title">About us</h6>
  <ul>
  <li>
@@ -40,7 +40,7 @@ const Footer = () => {
  <Link href="/landing">About the GPML Digital platform</Link>
  </li>
  </ul>
- </div>
+ </div> */}
  <div className="footer-item">
  <h6 className="title">GPML Tools</h6>
  <ul>
@@ -85,29 +85,20 @@ const Footer = () => {
  <ul className="social-links">
  <li>
  <a
- href="https://facebook.com/"
+ href="https://ke.linkedin.com/company/global-partnership-on-marine-litter"
  target="_blank"
  rel="noopener noreferrer"
  >
- <FacebookIcon />
- </a>
- </li>
- <li>
- <a
- href="http://twitter.com/"
- target="_blank"
- rel="noopener noreferrer"
- >
- <TwitterIcon />
+ <LinkedinIcon />
  </a>
  </li>
  <li>
  <a
- href="https://linkedin.com/"
+ href="https://www.youtube.com/channel/UCoWXFwDeoD4c9GoXzFdm9Bg"
  target="_blank"
  rel="noopener noreferrer"
  >
- <LinkedinIcon />
+ <YoutubeIcon />
  </a>
  </li>
  </ul>

diff --git a/frontend/src/components/icons.jsx b/frontend/src/components/icons.jsx
@@ -137,32 +137,6 @@ export const ArrowRight = ({
  </svg>
 )
 
-export const FacebookIcon = () => (
- <svg
- xmlns="http://www.w3.org/2000/svg"
- width="33"
- height="32"
- viewBox="0 0 33 32"
- fill="none"
- >
- <g clipPath="url(#clip0_1_3088)">
- <path
- d="M32.332 16C32.332 7.16479 25.1672 0 16.332 0C7.49683 0 0.332031 7.16479 0.332031 16C0.332031 24.8352 7.49683 32 16.332 32C16.426 32 16.5195 31.998 16.6133 31.9963V19.541H13.1758V15.5349H16.6133V12.5869C16.6133 9.16797 18.7004 7.30713 21.7502 7.30713C23.2107 7.30713 24.4661 7.41602 24.832 7.4646V11.0378H22.729C21.0698 11.0378 20.7485 11.8264 20.7485 12.9834V15.5349H24.7158L24.1987 19.541H20.7485V31.3818C27.4363 29.4646 32.332 23.3032 32.332 16Z"
- fill="currentColor"
- />
- </g>
- <defs>
- <clipPath id="clip0_1_3088">
- <rect
- width="32"
- height="32"
- fill="white"
- transform="translate(0.332031)"
- />
- </clipPath>
- </defs>
- </svg>
-)
 export const LinkedinIcon = () => (
  <svg
  xmlns="http://www.w3.org/2000/svg"
@@ -189,30 +163,20 @@ export const LinkedinIcon = () => (
  </defs>
  </svg>
 )
-export const TwitterIcon = () => (
+export const YoutubeIcon = () => (
  <svg
  width="33"
  height="32"
  viewBox="0 0 33 32"
  fill="none"
  xmlns="http://www.w3.org/2000/svg"
  >
- <g clipPath="url(#clip0_1_3090)">
- <path
- d="M16.1987 0C7.37631 0 0.198669 7.17764 0.198669 16C0.198669 24.8217 7.37631 32 16.1987 32C25.0204 32 32.1987 24.8217 32.1987 16C32.1987 7.17764 25.0217 0 16.1987 0ZM23.3363 12.338C23.3434 12.4966 23.3473 12.6564 23.3473 12.8162C23.3473 17.6828 19.6441 23.2924 12.8686 23.2924C10.7889 23.2924 8.85282 22.6846 7.22356 21.6392C7.51165 21.6734 7.80489 21.6908 8.102 21.6908C9.82793 21.6908 11.4153 21.1017 12.6759 20.1144C11.0647 20.0847 9.70419 19.0201 9.23565 17.5564C9.45993 17.599 9.6913 17.6228 9.92782 17.6228C10.2636 17.6228 10.5897 17.579 10.8984 17.4946C9.21373 17.1569 7.94474 15.6687 7.94474 13.8835C7.94474 13.868 7.94474 13.8519 7.94539 13.8371C8.44164 14.1123 9.00943 14.2786 9.61267 14.2973C8.62532 13.638 7.97503 12.5101 7.97503 11.2327C7.97503 10.5573 8.15613 9.92443 8.47322 9.38049C10.2887 11.6091 13.0033 13.0747 16.0633 13.2294C16.0002 12.9593 15.9686 12.679 15.9686 12.3896C15.9686 10.3562 17.6172 8.707 19.6505 8.707C20.7101 8.707 21.6658 9.15427 22.3387 9.86965C23.1784 9.70466 23.9647 9.39918 24.6782 8.97575C24.401 9.83614 23.8191 10.5573 23.0566 11.0136C23.8023 10.9247 24.5138 10.7275 25.1718 10.4342C24.6807 11.1715 24.0562 11.8205 23.3363 12.338Z"
- fill="currentColor"
- />
- </g>
- <defs>
- <clipPath id="clip0_1_3090">
- <rect
- width="32"
- height="32"
- fill="white"
- transform="translate(0.198669)"
- />
- </clipPath>
- </defs>
+ <path
+ fill-rule="evenodd"
+ clip-rule="evenodd"
+ d="M16.332 32C25.1686 32 32.332 24.8366 32.332 16C32.332 7.16344 25.1686 0 16.332 0C7.49548 0 0.332031 7.16344 0.332031 16C0.332031 24.8366 7.49548 32 16.332 32ZM5.18054 15.8484C5.18257 14.411 5.23995 12.9743 5.35254 11.5414C5.41481 10.6443 5.79933 9.79994 6.43521 9.16406C7.07109 8.52818 7.91543 8.14365 8.81254 8.08139C10.5895 7.95539 13.0165 7.84839 16.1805 7.84839C19.3445 7.84839 21.7705 7.95539 23.5485 8.08139C24.4457 8.14365 25.29 8.52818 25.9259 9.16406C26.5618 9.79994 26.9463 10.6443 27.0085 11.5414C27.1065 12.7884 27.1805 14.2724 27.1805 15.8484C27.1805 17.4804 27.1005 19.0154 26.9985 20.2884C26.8525 22.1054 25.4675 23.4944 23.6805 23.6184C21.8865 23.7434 19.3755 23.8484 16.1805 23.8484C12.9855 23.8484 10.4745 23.7434 8.68054 23.6184C6.89354 23.4944 5.50854 22.1054 5.36254 20.2884C5.26054 19.0154 5.18054 17.4804 5.18054 15.8484ZM14.1805 12.8484L19.6805 15.8484L14.1805 18.8484V12.8484Z"
+ fill="currentColor"
+ />
  </svg>
 )