tecitheme 0.0.13 → 0.0.16

package/components/Figure.svelte

@@ -4,9 +4,11 @@
   export let caption;
 </script>
 
-<section class="flex justify-center not-prose">
+<section class="flex justify-center not-prose mb-8">
   <figure class="bg-white w-auto mx-auto shadow-lg border border-slate-100 p-2">
-    <img class="w-full" src={image} alt={title} title={title}>
+    <a href={image}>
+      <img class="w-full" src={image} alt={title} title={title}>
+    </a>
     {#if caption}
       <figcaption class="text-center p-2">{@html caption}</figcaption>
     {/if}

package/components/Footer.svelte

@@ -21,7 +21,7 @@
     }
   </script>
   
-  <footer class="bg-gray-800" aria-labelledby="footerHeading">
+  <footer id="bottom" class="bg-gray-800" aria-labelledby="footerHeading">
     <h2 id="footerHeading" class="sr-only">Footer</h2>
     <div class="max-w-7xl mx-auto py-12 px-4 sm:px-6 lg:py-16 lg:px-8">
       <div class="xl:grid xl:grid-cols-3 xl:gap-8">

package/components/Icon.svelte

@@ -50,11 +50,7 @@
 	/>
 </span>
 {:else if icon?.startsWith("icon-")}
-<span class="not-prose">
-  <div class="{classes} bg-teci-blue-dark flex flex-col justify-center items-center">
-    <span class="material-icons block text-4xl text-white">{icon?.slice(5)}</span>
-  </div>
-</span>
+<span class="material-icons-outlined {classes}">{icon?.slice(5)}</span>
 {:else}
 <span class="not-prose">
 	<svg class={classes} xmlns="http://www.w3.org/2000/svg" viewBox="0 0 250 250">

package/components/Modal.svelte

@@ -16,7 +16,7 @@
     }} />
   
   {#if shown}
-    <div class="fixed inset-0 bg-gray-900 bg-opacity-50 overflow-y-auto h-full w-full">
+    <div class="z-50 fixed inset-0 bg-gray-900 bg-opacity-50 overflow-y-auto h-full w-full">
       <div class="relative top-20 mx-auto p-5 border w-96 shadow-lg bg-white">
         <button type="button" on:click={hide} class="absolute top-0 right-0 bg-white p-1 mr-2 mt-2 inline-flex items-center justify-center text-teci-blue-light hover:text-white hover:bg-teci-blue-dark focus:outline-none focus:ring-2 focus:ring-inset focus:ring-teci-blue-dark">
             <span class="sr-only">Close menu</span>

package/components/NewsGrid.svelte

@@ -1,4 +1,5 @@
 <script>
+  import { DateTime } from "luxon";
   export let data;
   export let posts;
 </script>
@@ -35,7 +36,7 @@
     {#each posts as post}
       <div>
         <p class="text-sm text-gray-500">
-          <time datetime={post.meta.date}>{post.meta.date}</time>
+          <time datetime={post.meta.date}>{DateTime.fromISO(post.meta.date).toLocaleString()}</time>
         </p>
         <a href={post.path} class="mt-2 block">
           <p class="text-xl font-semibold text-gray-900">

package/components/SidebarContent.svelte

@@ -1,53 +1,59 @@
 <script>
   import { onMount } from "svelte";
-  export let data;
+  import { buildToC } from "../utils.js";
+  import { DateTime } from "luxon";
 
-  let tocMoved = false;
+  export let data;
+  export let title;
+  export let date;
+  export let lastmod;
 
-  onMount(() => {
-    function moveTOC() {
-      console.log("Moving TOC");
-      var oldParent = document.getElementsByClassName('page-toc')[0];
-      if (oldParent && oldParent.nodeType == 1){
-        var newParent = document.getElementById('sidebar-nav');
-        var loader = document.getElementById('loader');
-        var classes = oldParent.classList;
-        newParent.insertAdjacentElement('beforeend', oldParent)
-        loader.remove();
-        classes.remove("hidden");
-        tocMoved = true;
-        console.log("TOC Moved")
-      } else {
-        console.log(tocMoved, oldParent);
-        if(!tocMoved && oldParent == undefined){
-          console.log("Reloading");
-          window.location.reload();
-        } else {
-          console.log("Leave it alone.")
-          tocMoved = true;
-        }
-      }
-    };
+  let formattedDate = (date != undefined ? DateTime.fromISO(date).toLocaleString() : undefined)
+  let formattedLastModDate = (lastmod != undefined ? DateTime.fromISO(lastmod).toLocaleString() : undefined)  
+  let tocOpen = false;
+  let tocBuilt = false;
+  let w;
+  
+  $: if (w > 702 && tocOpen == false) {tocOpen = true}
 
-    if (tocMoved == false && data.sidebar) {
-      moveTOC();
+  onMount( async () => {
+    if (data.toc) {
+      tocBuilt = buildToC();
     };
   });
 </script>
 
-<section class="w-auto mx-auto flex flex-col lg:flex-row items-start lg:space-x-8">
-  {#if data.sidebar}
-  <div id="sidebar-nav" class="pr-4 lg:text-right font-medium mb-4 w-auto lg:max-w-xs lg:mb-0 lg:w-60 lg:sticky lg:top-8 shrink-0 lg:border-r lg:border-r-gray-400">
-    <div id="loader">
-      <svg role="status" class="inline-block mr-2 w-6 h-6 text-gray-200 animate-spin dark:text-gray-600 fill-blue-600" viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
-        <path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/>
-        <path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/>
-      </svg>
-      <span class="inline-block">Loading...</span>
-    </div>
-  </div>
-  {/if}
-  <div id="text" class="w-full prose max-w-none lg:max-w-prose">
+<section bind:clientWidth={w} class="relative flex flex-row { data.fullWidth ? 'mx-0' : 'mx-auto'} {(data.toc || data.rightRail) ? 'md:space-x-8' : 'space-x-0'}">
+
+  <div id="content" class="prose w-full { data.fullWidth ? 'max-w-none' : 'max-w-prose'}">
+    <h1>{title}</h1>
+    <p>Published: {formattedDate}{#if (formattedLastModDate != formattedDate && formattedLastModDate)}, Updated: {formattedLastModDate}{/if}</p>
     <slot />
   </div>
+  <aside class="relative w-0 {(data.toc || data.rightRail) ? 'md:w-60' : 'hidden'}">
+    {#if data.toc}
+      <div class="sticky top-8 shrink-0 flex flex-col">
+        <button on:click={() => {tocOpen = !tocOpen;}} 
+          class="md:hidden absolute -left-10 w-10 h-10 flex items-center justify-center border border-teci-blue-light text-teci-blue-light bg-white
+          {tocOpen ? 'border-opacity-100 bg-opacity-100 text-opacity-100' : 'border-opacity-60 bg-opacity-20 text-opacity-60 hover:border-opacity-100 hover:bg-opacity-100 hover:text-opacity-100'}"
+          title="Table of Contents Toggle" alt="Table of Contents Toggle"
+        >
+          <span class="material-icons-outlined">menu_open</span>
+        </button>
+        {#if tocBuilt == false}
+          <svg role="status" class="inline-block m-2 w-6 h-6 text-gray-200 animate-spin dark:text-gray-600 fill-blue-600" viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
+            <path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/>
+            <path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/>
+          </svg>
+        {/if}
+        <div id="ToC" class="absolute md:relative -left-[282px] border shadow-md bg-white md:left-0 font-medium text-right md:text-left p-2 {tocOpen ? 'block w-60 mb-4' : 'hidden'}">
+        </div>
+      </div>
+    {/if}
+    {#if data.rightRail}
+      <div class="hidden md:block p-2 bg-gray-200 {(data.toc || data.rightRail) ? 'md:w-60' : 'w-0'}">
+        Dynamic Stuff
+      </div>
+    {/if}
+  </aside>
 </section>

package/components/SidebarContent.svelte.d.ts

@@ -3,6 +3,9 @@
 /** @typedef {typeof __propDef.slots}  SidebarContentSlots */
 export default class SidebarContent extends SvelteComponentTyped<{
     data: any;
+    title: any;
+    date: any;
+    lastmod: any;
 }, {
     [evt: string]: CustomEvent<any>;
 }, {
@@ -16,6 +19,9 @@ import { SvelteComponentTyped } from "svelte";
 declare const __propDef: {
     props: {
         data: any;
+        title: any;
+        date: any;
+        lastmod: any;
     };
     events: {
         [evt: string]: CustomEvent<any>;

package/components/ThreeColumn.svelte

@@ -11,6 +11,7 @@
 	export let data = [
 		{
 			icon: 'pyrosim',
+      classes: 'h-12 w-12',
 			image: 'https://www.thunderheadeng.com/wp-content/uploads/2013/09/company_pyrosim.jpg',
 			heading: 'Product 1',
 			subheading: 'Nutshell',
@@ -19,6 +20,7 @@
 		},
 		{
 			icon: '',
+      classes: '',
 			image: 'https://www.thunderheadeng.com/wp-content/uploads/2013/08/company_pathfinder.png',
 			heading: 'Product 2',
 			subheading: 'No Icon',
@@ -28,6 +30,7 @@
 		{
 			icon: 'icon-auto_stories',
 			image: 'https://www.thunderheadeng.com/wp-content/uploads/2013/08/company_petrasim.png',
+      classes: 'bg-teci-blue-dark text-white text-4xl grid place-items-center h-12 w-12',
 			heading: 'Google Icon, No Subtitle or Text',
 			subheading: '',
 			text: '',
@@ -39,19 +42,21 @@
 <!-- This example requires Tailwind CSS v2.0+ -->
 <div class="w-full mx-auto">
 	<h2 class="sr-only">{title}</h2>
-	<dl class="space-y-10 sm:grid sm:grid-cols-2 sm:gap-8 sm:space-y-0 lg:grid-cols-3">
+	<dl class="space-y-10 sm:grid sm:grid-cols-2 sm:gap-8 sm:space-y-0 md:grid-cols-3">
 		{#each data as col}
 			<div>
 				<a href={col.linkURL}>
 					<div class="space-y-4">
             {#if col.image}
 						<div class="w-full aspect-square bg-slate-100">
-							<img class="w-full aspect-square object-cover shadow-md border border-gray-200" src={col.image} alt="" />
+							<img class="w-full aspect-square object-cover shadow-md border border-gray-200" src={col.image} title={col.heading} alt={col.heading} />
 						</div>
             {/if}
 						<div class="flex flex-row items-start space-x-4">
               {#if col.icon}
-              <Icon classes="h-12 w-12" icon={col.icon} />
+              <div class="grid place-items-center">
+                <Icon classes={col.classes} icon={col.icon} />
+              </div>
               {/if}
 							<div class="leading-none font-medium flex flex-col">
 								<h3 class="text-2xl leading-none">{col.heading}</h3>

package/components/ThreeColumn.svelte.d.ts

@@ -4,6 +4,7 @@
 export default class ThreeColumn extends SvelteComponentTyped<{
     data?: {
         icon: string;
+        classes: string;
         image: string;
         heading: string;
         subheading: string;
@@ -23,6 +24,7 @@ declare const __propDef: {
     props: {
         data?: {
             icon: string;
+            classes: string;
             image: string;
             heading: string;
             subheading: string;

package/layouts/blocks.svelte

@@ -6,14 +6,19 @@
     import CTA from '../components/CTA.svelte';
     import SidebarContent from '../components/SidebarContent.svelte';
     import MediaFeature from '../components/MediaFeature.svelte';
+    import TrialForm from '../components/TrialForm.svelte';
 
     export let title
+    export let date
+    export let lastmod
     export let page_sections
     export let posts
+    export let summary
 </script>
 
 <svelte:head>
   <title>{title} | Thunderhead Engineering</title>
+  <meta name="description" content={summary}>
 </svelte:head>
 
 <article class="flex flex-col space-y-12">
@@ -29,11 +34,13 @@
   {:else if section.fieldGroup == "cta-center"}
     <CTA bind:data={section} />
   {:else if section.fieldGroup == "sidebar-content"}
-    <SidebarContent bind:data={section}>
+    <SidebarContent bind:data={section} {title} {date} {lastmod} {summary}>
       <slot/>
     </SidebarContent>
   {:else if section.fieldGroup == "media-feature"}
     <MediaFeature bind:data={section} />
+  {:else if section.fieldGroup == "trial"}
+    <TrialForm />
   {:else if section.fieldGroup == "content"}
     <div class="content prose"><slot/></div>
   {/if}

package/layouts/blocks.svelte.d.ts

@@ -3,8 +3,11 @@
 /** @typedef {typeof __propDef.slots}  BlocksSlots */
 export default class Blocks extends SvelteComponentTyped<{
     title: any;
+    date: any;
+    lastmod: any;
     page_sections: any;
     posts: any;
+    summary: any;
 }, {
     [evt: string]: CustomEvent<any>;
 }, {
@@ -18,8 +21,11 @@ import { SvelteComponentTyped } from "svelte";
 declare const __propDef: {
     props: {
         title: any;
+        date: any;
+        lastmod: any;
         page_sections: any;
         posts: any;
+        summary: any;
     };
     events: {
         [evt: string]: CustomEvent<any>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tecitheme",
-  "version": "0.0.13",
+  "version": "0.0.16",
   "svelte": true,
   "devDependencies": {
     "@jsdevtools/rehype-toc": "^3.0.2",
@@ -18,6 +18,7 @@
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-svelte3": "^3.4.0",
+    "luxon": "^2.3.1",
     "mdsvex": "^0.10.5",
     "postcss": "^8.4.6",
     "prettier": "^2.5.1",
@@ -35,7 +36,8 @@
     "three": "^0.137.5",
     "tslib": "^2.3.1",
     "typescript": "^4.5.5",
-    "vite": "^2.8.3"
+    "vite": "^2.8.3",
+    "vite-plugin-autoimport": "^1.4.3"
   },
   "type": "module",
   "dependencies": {
@@ -64,7 +66,6 @@
     "./components/TrialForm.svelte": "./components/TrialForm.svelte",
     "./components/YT.svelte": "./components/YT.svelte",
     "./layouts/blocks.svelte": "./layouts/blocks.svelte",
-    "./layouts/news.svelte": "./layouts/news.svelte",
     "./req_utils": "./req_utils.js",
     "./utils": "./utils.js",
     "./variables": "./variables.js"

package/utils.d.ts

@@ -1,3 +1,4 @@
 export function scrollTo(anchor: any): void;
 export function validateEmail(email: any): boolean;
+export function buildToC(): boolean;
 export function slugFromPath(path: any): any;

package/utils.js

@@ -9,4 +9,67 @@ export function validateEmail(email) {
     return re.test(String(email).toLowerCase());
 }
 
-export const slugFromPath = (path) => path.match(/([\w-]+)\.(svelte\.md|md|svx)/i)?.[1] ?? null;
+export const slugFromPath = (path) => path.match(/([\w-]+)\.(svelte\.md|md|svx)/i)?.[1] ?? null;
+
+export function buildToC() {
+  // Based on https://projectcodeed.blogspot.com/2020/04/an-automatic-table-of-contents.html
+  
+  // Get ToC div
+  let toc = document.getElementById("ToC");
+  
+  //Add a header
+  var tocHeader = document.createElement("a");
+  tocHeader.classList.add("mb-2", "inline-block", "w-auto", "text-center", "bg-gray-50", "hover:bg-gray-100", "py-1", "px-2", "border")
+  tocHeader.innerHTML = "<span class='material-icons-outlined text-sm font-bold text-gray-500 align-text-bottom'>vertical_align_top</span>";
+  tocHeader.setAttribute("href","#top");
+  tocHeader.setAttribute("title","To Top of Page");
+  toc.appendChild(tocHeader);
+
+  // Create a list for the ToC entries
+  let tocList = document.createElement("ul");
+
+  // Find the primary content section
+  let content = document.getElementById("content")
+
+  // Get the h2 tags - ToC entries
+  let headers = content.getElementsByTagName("h2");
+
+  if (headers.length == 0) {
+    console.log("There are not any H2 elements in the document.");
+  } else {
+    // For each h2
+    for (let i = 0; i < headers.length; i++){
+
+      // Get Heading ID
+      let name = headers[i].id
+    
+      // list item for the entry
+      let tocListItem = document.createElement("li");
+      tocListItem.classList.add("text-teci-blue-light", "hover:text-teci-blue-dark", "text-sm", "truncate"); 
+
+      // link for the h2
+      let tocEntry = document.createElement("a");
+      tocEntry.setAttribute("href","#"+name);
+      tocEntry.innerText=headers[i].innerText;
+
+      // add link to list item list
+      tocListItem.appendChild(tocEntry);
+
+      // add list item to list
+      tocList.appendChild(tocListItem);
+    }
+    
+    // add list to toc element
+    toc.appendChild(tocList);
+
+    //Add a footer
+    //var tocFooter = document.createElement("a");
+    //tocFooter.classList.add("mt-2", "inline-block", "w-auto", "text-center", "bg-gray-50", "hover:bg-gray-100", "py-1", "px-2", "border")
+    //tocFooter.innerHTML="<span class='material-icons-outlined text-sm font-bold text-gray-500 align-text-bottom'>vertical_align_bottom</span>";
+    //tocFooter.setAttribute("href","#bottom");
+    //tocFooter.setAttribute("title","To Bottom of Page");
+    //toc.appendChild(tocFooter);
+
+    return true;
+  }
+}

package/layouts/news.svelte

@@ -1,14 +0,0 @@
-<script>
-    export let title;
-    export let date;
-</script>
-
-<svelte:head>
-  <title>{title} | Thunderhead Engineering</title>
-</svelte:head>
-
-<div class="prose lg:prose-lg">
-  <h1>{title}</h1>
-  <p>Published on {date}</p>
-  <slot/>
-</div>

package/layouts/news.svelte.d.ts

@@ -1,29 +0,0 @@
-/** @typedef {typeof __propDef.props}  NewsProps */
-/** @typedef {typeof __propDef.events}  NewsEvents */
-/** @typedef {typeof __propDef.slots}  NewsSlots */
-export default class News extends SvelteComponentTyped<{
-    title: any;
-    date: any;
-}, {
-    [evt: string]: CustomEvent<any>;
-}, {
-    default: {};
-}> {
-}
-export type NewsProps = typeof __propDef.props;
-export type NewsEvents = typeof __propDef.events;
-export type NewsSlots = typeof __propDef.slots;
-import { SvelteComponentTyped } from "svelte";
-declare const __propDef: {
-    props: {
-        title: any;
-        date: any;
-    };
-    events: {
-        [evt: string]: CustomEvent<any>;
-    };
-    slots: {
-        default: {};
-    };
-};
-export {};