Merge branch 'landing_page'

src/lib/components/NavigationFooter.svelte

@@ -3,17 +3,22 @@
     import ScrollToTop from "$lib/components/ScrollToTop.svelte";
     import Link from "$lib/components/Link.svelte";
 
+    import { CDN } from "$lib/constants";
+
     import { navigation } from "$lib/navigation";
 </script>
 
 <div class="navigation-footer">
     <div class="navigation-footer-column-left">
-        <Link
+        <div class="navigation-footer-logo-link">
-            class="navigation-footer-site-name"
+            <a href="https://esaform.org/">
-            text="AM-D-Model.eu"
+                <img
-            hotkey="a"
+                    class="navigation-footer-logo"
-            redirectFunc={navigation.toHome}
+                    src="{CDN}/ESAFORM_logo.webp"
+                    alt="ESAFORM Logo"
                 />
+            </a>
+        </div>
         <div class="navigation-footer-social-media">
             <div class="navigation-footer-buttons-icon">
                 <img
@@ -46,14 +51,17 @@
         </div>
     </div>
     <div class="navigation-footer-column-mid">
-        <ScrollToTop
+        <ScrollToTop class="navigation-footer-return" text="↥↥↥ Return to top ↥↥↥" />
-            class="navigation-footer-return"
-            text="↥↥↥ Return to top ↥↥↥"
-        />
     </div>
     <div class="navigation-footer-column-right">
         <div class="navigation-footer-topic-column">
             <div class="navigation-footer-topic">Topic</div>
+            <Link
+                class="navigation-footer-link"
+                text="Home"
+                hotkey="d"
+                redirectFunc={navigation.toHome}
+            />
             <Link
                 class="navigation-footer-link"
                 text="Data Repository"

src/lib/components/NavigationHeader.svelte

@@ -3,11 +3,14 @@
     import Button from "$lib/components/Button.svelte";
     import Link from "$lib/components/Link.svelte";
 
+    import { CDN } from "$lib/constants";
+
     export let items_class = "";
     export let link_class = "";
     export let button_class = "";
     export let button_text_class = "";
-    export let display_title = true;
+    export let display_home = true;
+    export let display_logo = true;
 
     import { navigation } from "$lib/navigation";
 </script>
@@ -15,6 +18,14 @@
 <div class={$$props.class}>
     <div class="navigation-header">
         <div class="flexrow-right navigation-header-items {items_class}">
+            {#if display_home}
+                <Link
+                    class="navigation-header-link {link_class}"
+                    text="Home"
+                    hotkey="d"
+                    redirectFunc={navigation.toHome}
+                />
+            {/if}
             <Link
                 class="navigation-header-link {link_class}"
                 text="Data Repository"
@@ -35,14 +46,15 @@
                 redirectFunc={navigation.toContact}
             />
         </div>
-        {#if display_title}
+        {#if display_logo}
-            <div class="flexrow-left navigation-header-items {items_class}">
+            <div class="flexrow-left navigation-header-logo-link {items_class}">
-                <Link
+                <a href="https://esaform.org/">
-                    class="navigation-header-site-name"
+                    <img
-                    text="AM-D-Model.eu"
+                        class="navigation-header-logo"
-                    hotkey="a"
+                        src="{CDN}/ESAFORM_logo.webp"
-                    redirectFunc={navigation.toHome}
+                        alt="ESAFORM Logo"
                     />
+                </a>
             </div>
         {/if}
     </div>

src/lib/styles/NavigationFooter.scss

@@ -19,6 +19,17 @@
   justify-content: center;
 }
 
+.navigation-footer-logo-link {
+  max-width: 180px;
+  padding-left: 24px;
+}
+
+.navigation-footer-logo {
+  height: 180px;
+  max-width: 180px;
+  width: auto;
+}
+
 .navigation-footer-column-left {
   @extend .navigation-footer-column;
   justify-content: space-between;

src/lib/styles/NavigationHeader.scss

@@ -52,13 +52,21 @@
   text-decoration: none;
 }
 
-.navigation-header-site-name {
+.navigation-header-logo-link {
-    color: #000000;
+  @extend .navigation-header-items;
-    text-align: left;
+  min-width: 128px;
-    font-family: "Assistant", sans-serif;
+}
-    font-size: 24px;
+
-    position: relative;
+.navigation-header-logo {
-    padding: 8px;
+  height: 128px;
+  width: auto;
+  max-width: 128px;
+}
+
+.navigation-header-logo {
+  height: 128px;
+  width: auto;
+  padding-left: 28px;
 }
 
 .flexrow-right {

src/lib/styles/styles.css

@@ -22,8 +22,14 @@ menu,
 ol,
 ul {
     list-style-type: none;
+    list-style-position: inside;
     margin: 0;
     padding: 0;
+    font-size: 18pt
+}
+
+li {
+    padding-bottom: 24px
 }
 
 h1 {
@@ -42,6 +48,15 @@ label {
     line-height: 1.5;
 }
 
+h3 {
+    font-family: "Assistant";
+    font-style: italic;
+    color: #B6B6B6;
+    font-size: 24pt;
+    padding-bottom: 2px;
+    line-height: 1.5;
+}
+
 label {
     font-size: 1.75rem;
 }
@@ -61,9 +76,15 @@ p {
         font-size: 28pt;
     }
 
+    h3,
     p {
         font-size: 18pt;
     }
+
+    ol,
+    ul {
+        font-size: 16pt;
+    }
 }
 
 @media (max-width: 420px) {
@@ -75,9 +96,15 @@ p {
         font-size: 24pt;
     }
 
+    h3,
     p {
         font-size: 16pt;
     }
+
+    ol,
+    ul {
+        font-size: 14pt;
+    }
 }
 
 @media (max-width: 380px) {
@@ -89,7 +116,13 @@ p {
         font-size: 24pt;
     }
 
+    h3,
     p {
         font-size: 16pt;
     }
+
+    ol,
+    ul {
+        font-size: 14pt;
+    }
 }

src/routes/+page.svelte

@@ -39,7 +39,8 @@
         <div class="landing-zone">
             <NavigationHeader
                 class="splash-navigation-header"
-                display_title={false}
+                display_home={false}
+                display_logo={false}
             />
             <Splash />
         </div>

src/routes/about/+page.svelte

@@ -11,49 +11,87 @@
             <h1>How Can I Get Involved?</h1>
 
             <section>
-                <h2>Contributing Data</h2>
+                <h2>Sharing Data</h2>
                 <p>
-                    All data for the AM-D-Model project is managed via our
+                    As a project aimed at producing a benchmark dataset, the most important
-                    Invenio instance. Researchers who wish to contribute can
+                    contribution you can make is by sharing data. Whether contributing to the data
-                    request access via our Invenio homepage, at the “Data
+                    or using the data in your own research, a project such as this is built on
-                    Repository” link. External contributors will initially be
+                    researcher engagement with the dataset we are producing. As such, in the spirit
-                    given a 50GB data storage allocation, with the ability to
+                    of open science we encourage any interested researchers to get involved in the
+                    production and analysis of this dataset. And following the final, open release
+                    of the dataset we even further encourage researchers to share this dataset as a
+                    universal benchmark for the PBF community at large.
+                </p>
+                <p>
+                    To ensure the success of this project, we ask only that researchers who wish to
+                    make use of this dataset respect the following essential project requirements:
+                </p>
+                <ul class="list-disc">
+                    <li>
+                        All contributors will be appropriately included as authors in the IJMF
+                        publication announcing public release. Participants will be contacted by our
+                        publication coordinator to request a writeup of their contributions and/or
+                        findings of note to be included in the release publication. The public
+                        release publication is currently expected to be submitted before October 1st
+                        2025.
+                    </li>
+                    <li>
+                        We insist that participants do not share or publish the dataset before the
+                        official public release. This is to avoid damaging our ability to measure
+                        the impact of the benchmark dataset project. This is important as our
+                        ability to justify future open science initiatives such as this is heavily
+                        dependant on such impact metrics.
+                    </li>
+                    <li>
+                        Participants are asked to attend and/or present in person at the ESAFORM
+                        2025 conference. This conference will be a key milestone of project
+                        participation, including open discussions among project participants on the
+                        state and direction of the project. In-person cooperation is core to
+                        collaborative projects such as these, so we ask that at least one member of
+                        each participating team meet with the core project team at the conference so
+                        we can build lasting collaborative research relationships.
+                    </li>
+                </ul>
+                <section>
+                    <h3>Contributing Data</h3>
+                    <p>
+                        All data for the AM-D-Model project is managed via our Invenio instance.
+                        Researchers who wish to contribute can request access via our Invenio
+                        homepage, at the “Data Repository” link. External contributors will
+                        initially be given a 50GB data storage allocation, with the ability to
                         request more from our repository administrators if required.
                     </p>
                 </section>
 
                 <section>
-                <h2>Accessing Data</h2>
+                    <h3>Accessing Data</h3>
                     <p>
-                    Data for the AM-D-Model project is planned to first be made
+                        Data for the AM-D-Model project is planned to first be made publicly
-                    publicly available on our Invenio instance once it is
+                        available on our Invenio instance once it is possible to do so. Data is also
-                    possible to do so. Data is also intended to be disseminated
+                        intended to be disseminated via other means such as material science data
-                    via other means such as material science data repositories
+                        repositories and published datasets once the dissemination phase of the
-                    and published datasets once the dissemination phase of the
+                        project begins. For those interested, the latest information on data
-                    project begins. For those interested, the latest information
+                        accessibility will be made available here.
-                    on data accessibility will be made available here.
                     </p>
                 </section>
+            </section>
 
             <section>
                 <h2>Collaboration with the AM-D-Model team</h2>
                 <p>
-                    Researchers interested in other collaborative opportunities
+                    Researchers interested in other collaborative opportunities with the AM-D-Model
-                    with the AM-D-Model team can contact us via the “Contact Us”
+                    team can contact us via the “Contact Us” button, or via the various social media
-                    button, or via the various social media channels made
+                    channels made available in the footer of this page.
-                    available in the footer of this page.
                 </p>
             </section>
 
             <section>
                 <h2>Inquiries</h2>
                 <p>
-                    We aren’t only interested in hearing from researchers, we
+                    We aren’t only interested in hearing from researchers, we also want to hear from
-                    also want to hear from all those with an interest in our
+                    all those with an interest in our project. If you have any inquiries about the
-                    project. If you have any inquiries about the project and
+                    project and contributing to a community effort towards an open, data driven
-                    contributing to a community effort towards an open, data
+                    future for L-PBF please feel free to let us know via the “Contact Us” button.
-                    driven future for L-PBF please feel free to let us know via
-                    the “Contact Us” button.
                 </p>
             </section>
         </main>