From ab09a75a926162b59e5c8b85637f5badd106953c Mon Sep 17 00:00:00 2001
From: Adam Joseph Arling <aarling@gmail.com>
Date: Mon, 21 Aug 2023 09:25:04 -0500
Subject: [PATCH 1/3] Add trademark info to the footer. Upgrade footer layout
 as well

---
 components/layout/Footer.jsx | 100 ++++++++++++++++++++++++++---------
 1 file changed, 76 insertions(+), 24 deletions(-)

diff --git a/components/layout/Footer.jsx b/components/layout/Footer.jsx
index e0c1240b2..06b03a4b6 100644
--- a/components/layout/Footer.jsx
+++ b/components/layout/Footer.jsx
@@ -1,32 +1,84 @@
-import React from "react";
-import { SocialIcon } from "react-social-icons";
-
-const SocialIconWrapper = ({ Component, ...restProps }) => {
-  return <Component bgColor="#fff" fgColor="#333" {...restProps} />;
+const navigation = {
+  main: [
+    { name: "Contact Us", href: "/get-started/contact-us" },
+    { name: "Getting Started", href: "/get-started/getting-started" },
+    {
+      name: "Examples and Demos",
+      href: "/repository-solutions/examples-and-demos",
+    },
+    { name: "FAQ", href: "/the-community/faq" },
+    { name: "News and Events", href: "/news-and-events" },
+  ],
+  social: [
+    {
+      name: "Twitter",
+      href: "https://twitter.com/SamveraRepo",
+      icon: (props) => (
+        <svg fill="currentColor" viewBox="0 0 24 24" {...props}>
+          <path d="M8.29 20.251c7.547 0 11.675-6.253 11.675-11.675 0-.178 0-.355-.012-.53A8.348 8.348 0 0022 5.92a8.19 8.19 0 01-2.357.646 4.118 4.118 0 001.804-2.27 8.224 8.224 0 01-2.605.996 4.107 4.107 0 00-6.993 3.743 11.65 11.65 0 01-8.457-4.287 4.106 4.106 0 001.27 5.477A4.072 4.072 0 012.8 9.713v.052a4.105 4.105 0 003.292 4.022 4.095 4.095 0 01-1.853.07 4.108 4.108 0 003.834 2.85A8.233 8.233 0 012 18.407a11.616 11.616 0 006.29 1.84" />
+        </svg>
+      ),
+    },
+    {
+      name: "GitHub",
+      href: "https://github.com/samvera",
+      icon: (props) => (
+        <svg fill="currentColor" viewBox="0 0 24 24" {...props}>
+          <path
+            fillRule="evenodd"
+            d="M12 2C6.477 2 2 6.484 2 12.017c0 4.425 2.865 8.18 6.839 9.504.5.092.682-.217.682-.483 0-.237-.008-.868-.013-1.703-2.782.605-3.369-1.343-3.369-1.343-.454-1.158-1.11-1.466-1.11-1.466-.908-.62.069-.608.069-.608 1.003.07 1.531 1.032 1.531 1.032.892 1.53 2.341 1.088 2.91.832.092-.647.35-1.088.636-1.338-2.22-.253-4.555-1.113-4.555-4.951 0-1.093.39-1.988 1.029-2.688-.103-.253-.446-1.272.098-2.65 0 0 .84-.27 2.75 1.026A9.564 9.564 0 0112 6.844c.85.004 1.705.115 2.504.337 1.909-1.296 2.747-1.027 2.747-1.027.546 1.379.202 2.398.1 2.651.64.7 1.028 1.595 1.028 2.688 0 3.848-2.339 4.695-4.566 4.943.359.309.678.92.678 1.855 0 1.338-.012 2.419-.012 2.747 0 .268.18.58.688.482A10.019 10.019 0 0022 12.017C22 6.484 17.522 2 12 2z"
+            clipRule="evenodd"
+          />
+        </svg>
+      ),
+    },
+  ],
 };
 
-export default function Footer() {
-  const today = new Date();
+const year = new Date().getFullYear();
 
+export default function Footer() {
   return (
-    <footer className="p-10 flex flex-col justify-center items-center">
-      <div className="font-fontinBold mb-3">
-        &copy; {today.getFullYear()} Samvera
+    <footer className="">
+      <div className="px-6 py-20 mx-auto overflow-hidden max-w-7xl sm:py-24 lg:px-8">
+        <nav
+          className="-mb-6 columns-2 sm:flex sm:justify-center sm:space-x-12"
+          aria-label="Footer"
+        >
+          {navigation.main.map((item) => (
+            <div key={item.name} className="pb-6">
+              <a
+                href={item.href}
+                className="text-sm leading-6 text-gray-600 hover:text-gray-900"
+              >
+                {item.name}
+              </a>
+            </div>
+          ))}
+        </nav>
+        <div className="flex justify-center mt-10 space-x-10">
+          {navigation.social.map((item) => (
+            <a
+              key={item.name}
+              href={item.href}
+              className="text-gray-400 hover:text-gray-500"
+            >
+              <span className="sr-only">{item.name}</span>
+              <item.icon className="w-6 h-6" aria-hidden="true" />
+            </a>
+          ))}
+        </div>
+        <div className="max-w-4xl mx-auto mt-10 text-xs leading-5 text-center text-gray-500">
+          <p className="">&copy; {year} Samvera.org. All rights reserved.</p>
+          <p className="">
+            The Samvera name is a trademark in the USA, the UK and in the
+            European Union; it is the subject of a trademark application in
+            Canada. The Samvera logo is a trademark in the USA and is the
+            subject of trademark applications in the UK, Canada and the European
+            Union.
+          </p>
+        </div>
       </div>
-      <ul className="flex flex-row">
-        <li>
-          <SocialIconWrapper
-            Component={SocialIcon}
-            url="https://twitter.com/SamveraRepo"
-          />
-        </li>
-        <li>
-          <SocialIconWrapper
-            Component={SocialIcon}
-            url="https://github.com/samvera"
-          />
-        </li>
-      </ul>
     </footer>
   );
 }

From bb8f4edfb816f5a536e02bf9e121c14a2e91ea0d Mon Sep 17 00:00:00 2001
From: Adam Joseph Arling <aarling@gmail.com>
Date: Mon, 21 Aug 2023 09:28:59 -0500
Subject: [PATCH 2/3] Add new motto

---
 components/BannerContact.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/BannerContact.jsx b/components/BannerContact.jsx
index ad2eac612..1c762feaa 100644
--- a/components/BannerContact.jsx
+++ b/components/BannerContact.jsx
@@ -13,7 +13,7 @@ export default function BannerContact() {
       }}
     >
       <h3 className="mb-6 text-center text-white title">
-        If you want to go far, go together.
+        Growing open technologies, together.
       </h3>
       <button
         className="button"

From 234be454c11a0d5ea1ce8aac9178be2a2aa91c8d Mon Sep 17 00:00:00 2001
From: Adam Joseph Arling <aarling@gmail.com>
Date: Mon, 21 Aug 2023 16:00:45 -0500
Subject: [PATCH 3/3] Update trademark footer text

---
 components/layout/Footer.jsx | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/components/layout/Footer.jsx b/components/layout/Footer.jsx
index 06b03a4b6..acacdc020 100644
--- a/components/layout/Footer.jsx
+++ b/components/layout/Footer.jsx
@@ -71,11 +71,9 @@ export default function Footer() {
         <div className="max-w-4xl mx-auto mt-10 text-xs leading-5 text-center text-gray-500">
           <p className="">&copy; {year} Samvera.org. All rights reserved.</p>
           <p className="">
-            The Samvera name is a trademark in the USA, the UK and in the
-            European Union; it is the subject of a trademark application in
-            Canada. The Samvera logo is a trademark in the USA and is the
-            subject of trademark applications in the UK, Canada and the European
-            Union.
+            The Samvera name is a trademark in the USA, Canada, the UK and in
+            the European Union. The Samvera logo is a trademark in the USA,
+            Canada, the UK and in the European Union.
           </p>
         </div>
       </div>