Merge branch 'release/2024.03'

iop-alliance · Dec 12, 2024 · 3e7b187 · 3e7b187
2 parents 1d22789 + 1a25c17
commit 3e7b187
Show file tree

Hide file tree

Showing 15 changed files with 100 additions and 234 deletions.
diff --git a/assets/css/app.css b/assets/css/app.css
@@ -2,4 +2,6 @@
 @import "tailwindcss/components";
 @import "tailwindcss/utilities";
 
+@import url('https://fonts.googleapis.com/css2?family=Space+Grotesk:[email protected]&display=swap');
+
 /* This file is for your main application CSS */
diff --git a/lib/maker_passport/maker.ex b/lib/maker_passport/maker.ex
@@ -54,7 +54,7 @@ defmodule MakerPassport.Maker do
         from q in query, preload: ^preload
     end)
     |> Repo.all()
-    |> Repo.preload([:user])
+    |> Repo.preload([:user, :skills])
   end
 
   @doc """

diff --git a/lib/maker_passport_web/components/layouts/root.html.heex b/lib/maker_passport_web/components/layouts/root.html.heex
@@ -11,15 +11,15 @@
     <script defer phx-track-static type="text/javascript" src={~p"/assets/app.js"}>
     </script>
   </head>
-  <body>
+  <body class="bg-[#F9FAFA]">
     <div
       class="relative flex size-full min-h-screen flex-col bg-[#F9FAFA] group/design-root 
              overflow-x-hidden"
       style='font-family: "Space Grotesk", "Noto Sans", sans-serif;'
     >
       <div class="layout-container flex h-full grow flex-col">
         <!-- START: Top nav -->
-        <nav class="navbar bg-indigo-50 border-b-2 border-gray-200 shadow-sm">
+        <nav class="navbar bg-white border-b-2 border-gray-200 shadow-sm">
           <div class="navbar-start">
             <div class="dropdown">
               <div tabindex="0" role="button" class="btn btn-ghost lg:hidden">
@@ -47,7 +47,15 @@
                     href={~p"/profiles"}
                     class="text-[#1C1D22] text-sm font-medium leading-normal hover:text-zinc-700"
                   >
-                    Makers
+                    MAKERS
+                  </.link>
+                </li>
+                <li>
+                  <.link
+                    href={~p"/about"}
+                    class="text-[#1C1D22] text-sm font-medium leading-normal hover:text-zinc-700"
+                  >
+                    ABOUT
                   </.link>
                 </li>
               </ul>
@@ -85,9 +93,18 @@
               <li>
                 <.link
                   href={~p"/profiles"}
-                  class="text-[#1C1D22] text-lg font-medium leading-normal hover:text-zinc-700 hover:bg-indigo-200"
+                  class="text-[#1C1D22] text-lg font-medium leading-normal hover:text-zinc-50 hover:bg-zinc-500"
+                >
+                  MAKERS
+                </.link>
+              </li>
+              <li class="text-lg font-medium leading-normal pt-2">|</li>
+              <li>
+                <.link
+                  href={~p"/about"}
+                  class="text-[#1C1D22] text-lg font-medium leading-normal hover:text-zinc-50 hover:bg-zinc-500"
                 >
-                  Makers
+                  ABOUT
                 </.link>
               </li>
             </ul>
@@ -205,7 +222,43 @@
         </nav>
         <!-- END: Top nav -->
         <%= @inner_content %>
-      </div>
+      </div>  
+      <footer class="footer bg-base-300 text-base-content p-10">
+        <aside>
+          <img src={~p"/images/IOP-logo-white.png"} alt="Internet of Production Logo" class="h-16" />
+          <p>
+            Internet of Production is a company
+            <br />
+            and charity registered in
+            <br />
+            England and Wales. 
+            <br />
+            Charity: 1184807
+          </p>
+        </aside>
+        <nav>
+          <h6 class="footer-title">Explore</h6>
+          <.link href={~p"/profiles"} class="link link-hover">Find Makers</.link>
+          <.link href={~p"/about"} class="link link-hover">About the project</.link>
+        </nav>
+        <nav>
+          <h6 class="footer-title">Funding Partners</h6>
+          <div class="grid grid-flow-row gap-4">
+            <.link href="https://www.risa-fund.org" target="_blank" rel="noreferrer">
+              <img
+                alt="Logo of The Research and Innovation Systems for Africa (RISA) Fund"
+                src="/images/RISA-white-logo.png"
+                class="w-32 my-0"
+              />
+            </.link>
+            <img
+              alt="Logo of the Next Generation Internet Data Portability and Services Incubator"
+              src="/images/UKID-white-logo.jpg"
+              class="w-32 my-0"
+            />
+          </div>
+        </nav>
+      </footer>
     </div>
   </body>
 </html>
diff --git a/lib/maker_passport_web/controllers/page_controller.ex b/lib/maker_passport_web/controllers/page_controller.ex
@@ -1,9 +1,9 @@
 defmodule MakerPassportWeb.PageController do
   use MakerPassportWeb, :controller
 
-  def home(conn, _params) do
+  def about(conn, _params) do
     # The home page is often custom made,
     # so skip the default app layout.
-    render(conn, :home, layout: false)
+    render(conn, :about, layout: false)
   end
 end
diff --git a/lib/maker_passport_web/controllers/page_html/about.html.heex b/lib/maker_passport_web/controllers/page_html/about.html.heex
@@ -0,0 +1,31 @@
+<div class="prose mx-auto py-10 text-gray-800">
+  <h1 class="text-gray-600">
+    About the Maker Passport platform
+  </h1>
+  <p>
+    This platform is designed to help makers showcase their profiles, skills, and certifications (with issuance details and digital badges), location, and links to personal or professional websites, social media accounts, and projects.
+  </p>
+  <p>
+    This platform aims to connect makers with potential collaborators or clients based on their skills, certifications, and location.
+  </p>
+
+  <hr class="border border-primary opacity-25 w-75 mx-auto mt-4 mb-3" />
+  <h2 class="text-gray-600">Support</h2>
+  <p>This project was made possible thorugh the generous support of:</p>
+  <div class="flex flex-col md:flex-row items-center">
+    <.link href="https://www.risa-fund.org" target="_blank" rel="noreferrer" class="flex-1">
+      <img
+        alt="Logo of The Research and Innovation Systems for Africa (RISA) Fund"
+        src="/images/RISA-logo.png"
+        class="h-32 my-0"
+      />
+    </.link>
+    <div class="flex-1">
+      <img
+        alt="Logo of the Next Generation Internet Data Portability and Services Incubator"
+        src="/images/UKID-logo.png"
+        class="h-32 my-0"
+      />
+    </div>
+  </div>
+</div>