tecitheme 0.1.5 → 0.1.8

package/components/Card.svelte

@@ -10,8 +10,12 @@
 
   if (dev && data.image) {
     backgroundImage = data.image;
-  } else {
-    backgroundImage = 'https://thunderheadeng-www.imgix.net'+data.image+'?w=1200&h=627&fit=crop&auto=compress&auto=format';
+  } else if (data.image) {
+    if (data.image.includes("gif")) {
+      backgroundImage = 'https://thunderheadeng-www.imgix.net'+data.image;
+    } else {
+      backgroundImage = 'https://thunderheadeng-www.imgix.net'+data.image+'?w=1200&h=627&fit=crop&auto=compress&auto=format';
+    }
   }
 
 </script>

package/components/Figure.svelte

@@ -9,16 +9,25 @@
   let figureImage;
   let figureLink;
 
-  if (dev) {
+  if (dev && image) {
     figureImage = image
     figureLink = link ? link : image
-  } else {
-    figureImage = image.startsWith('http') ? image : 'https://thunderheadeng-www.imgix.net'+image+'?auto=compress&auto=format'
-    figureLink = link ? link : image.startsWith('http') ? image : 'https://thunderheadeng-www.imgix.net'+image
+  } else if (image) {
+    if (image.startsWith('http')) {
+      figureImage = image;
+      figureLink = link ? link : image
+    } else if (image.includes("gif")) {
+      figureImage = 'https://thunderheadeng-www.imgix.net'+image;
+      figureLink = link ? link : 'https://thunderheadeng-www.imgix.net'+image
+    } else {
+      figureImage = 'https://thunderheadeng-www.imgix.net'+image+'?auto=compress&auto=format';
+      figureLink = link ? link : 'https://thunderheadeng-www.imgix.net'+image
+    }
   }
 
 </script>
 
+{#if image}
 <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">
     <a href={figureLink}>
@@ -29,3 +38,4 @@
     {/if}
   </figure>
 </section>
+{/if}

package/components/MediaFeature.svelte

@@ -7,13 +7,29 @@ import Video from './Video.svelte'
   let figureImage;
   let figureLink;
 
-  if (dev) {
+  if (dev && data.image) {
     figureImage = data.image
     figureLink = data.image
-  } else {
+  } else if (data.image) {
     figureImage = data.image.startsWith('http') ? data.image : 'https://thunderheadeng-www.imgix.net'+data.image+'?w=576&ar=16:9&fit=crop&auto=compress&auto=format'
     figureLink = data.image.startsWith('http') ? data.image : 'https://thunderheadeng-www.imgix.net'+data.image
   }
+
+  if (dev && data.image) {
+    figureImage = data.image
+    figureLink = data.link ? data.link : data.image
+  } else if (data.image) {
+    if (data.image.startsWith('http')) {
+      figureImage = data.image;
+      figureLink = data.link ? data.link : data.image
+    } else if (data.image.includes("gif")) {
+      figureImage = 'https://thunderheadeng-www.imgix.net'+data.image;
+      figureLink = data.link ? data.link : 'https://thunderheadeng-www.imgix.net'+data.image
+    } else {
+      figureImage = 'https://thunderheadeng-www.imgix.net'+data.image+'?w=576&ar=16:9&fit=crop&auto=compress&auto=format';
+      figureLink = data.link ? data.link : 'https://thunderheadeng-www.imgix.net'+data.image
+    }
+  }
 </script>
 
 <section class="w-full mx-auto flex flex-col items-center md:flex-row md:items-start justify-center">

package/components/NewsGrid.svelte

@@ -1,5 +1,4 @@
 <script>
-  import { DateTime } from 'luxon';
   import { getContext } from 'svelte';
   import { paginate, PaginationNav } from 'svelte-paginate';
   import Icon from './Icon.svelte';
@@ -7,7 +6,6 @@
   export let data;
 
   let posts = getContext('newsPosts');
-
   let filteredPosts = [];
   let items = [];
   let currentPage = 1;
@@ -32,7 +30,7 @@
 
   function filterPosts(arr, terms) {
     for (let i = 0; i < arr.length; ) {
-      if (termExists(arr[i].meta.categories, terms)) {
+      if (termExists(arr[i].categories, terms)) {
         i++;
         continue;
       }
@@ -100,20 +98,20 @@
           <div class="flex h-full flex-col items-stretch ">
             <time
               class="mb-1 block text-sm text-gray-500"
-              datetime="{post.meta.date}"
-              >{DateTime.fromISO(post.meta.date).toLocaleString()}</time
+              datetime="{post.date}"
+              >{new Date(post.date).toLocaleDateString('en-us', { weekday:"short", year:"numeric", month:"short", day:"numeric", timeZone: "UTC", timeZoneName: "short"})}</time
             >
             <h2 class="mb-2 text-xl font-semibold text-gray-900">
-              <a href="/{post.path}">
-                {post.meta.title}
+              <a href="{post.slug}">
+                {post.title}
               </a>
             </h2>
-            {#if post.meta.summary}
+            {#if post.summary}
               <p class="mb-2 flex-1 text-base text-gray-500">
-                <a href="/{post.path}">
-                  {post.meta.summary.length > 190
-                    ? post.meta.summary.substring(0, 190) + ' ...'
-                    : post.meta.summary}
+                <a href="{post.slug}">
+                  {post.summary.length > 190
+                    ? post.summary.substring(0, 190) + ' ...'
+                    : post.summary}
                 </a>
               </p>
             {:else}
@@ -121,9 +119,9 @@
                 Missing Summary Text
               </p>
             {/if}
-            {#if post.meta.categories}
+            {#if post.categories}
               <div class="flex w-full flex-wrap text-sm">
-                {#each post.meta.categories.sort() as term}
+                {#each post.categories.sort() as term}
                   <a
                     class="mr-2 mb-2 inline-block"
                     href="/news/filter/{term}"
@@ -140,7 +138,7 @@
             <p
               class="text-sm font-semibold text-teci-blue-light hover:text-teci-blue-dark"
             >
-              <a href="/{post.path}">
+              <a href="{post.slug}">
                 Read full article<span aria-hidden="true">&nbsp;→</span>
               </a>
             </p>

package/components/SidebarContent.svelte

@@ -1,15 +1,14 @@
 <script>
   import { onMount } from "svelte";
   import { buildToC } from "../utils.js";
-  import { DateTime } from "luxon";
 
   export let data;
   export let title;
   export let date;
   export let lastmod;
 
-  let formattedDate = (date != undefined ? DateTime.fromISO(date).toLocaleString() : undefined)
-  let formattedLastModDate = (lastmod != undefined ? DateTime.fromISO(lastmod).toLocaleString() : undefined)  
+  let formattedDate = (date != undefined ? new Date(date).toLocaleDateString('en-us', { weekday:"short", year:"numeric", month:"short", day:"numeric", timeZone: "UTC", timeZoneName: "short"})  : undefined)
+  let formattedLastModDate = (lastmod != undefined ? new Date(lastmod).toLocaleDateString('en-us', { weekday:"short", year:"numeric", month:"short", day:"numeric", timeZone: "UTC", timeZoneName: "short"}) : undefined)  
   let tocOpen = false;
   let tocBuilt = false;
   let w;
@@ -31,7 +30,7 @@
     {/if}
     <slot />
     {#if (formattedDate && data.showDate)}
-    <p class="text-sm">Published: {formattedDate}{#if (formattedLastModDate != formattedDate && formattedLastModDate)}, Updated: {formattedLastModDate}{/if}</p>
+    <p class="text-sm">Published: {formattedDate}{#if (formattedLastModDate != formattedDate && formattedLastModDate)}&nbsp;&nbsp;|&nbsp;&nbsp;Last Updated: {formattedLastModDate}{/if}</p>
     {/if}
   </div>
   <aside class="relative w-0 {(data.toc || data.rightRail) ? 'md:w-60' : 'hidden'}">

package/get-content.d.ts

@@ -0,0 +1,8 @@
+export function getContent(content: any): Promise<{
+    title: any;
+    content: any;
+    summary: any;
+    date: Date;
+    slug: string;
+    categories: any;
+}[]>;

package/get-content.js

@@ -0,0 +1,79 @@
+// get-content.js
+// HTML parser from https://github.com/html-to-text/node-html-to-text
+import { convert } from "html-to-text"
+import { dev } from "$app/env";
+
+export async function getContent (content) {
+  let indexData = []
+  let iterableContentFiles = Object.entries([])
+  let sortedIndex = []
+
+  // Use 'content' variable to determine files to import.
+  switch (content) {
+    case "news":
+      iterableContentFiles = Object.entries(import.meta.glob("/src/routes/news/*(!(*index|*news)).md"));
+      break;
+    default:
+      iterableContentFiles = Object.entries(import.meta.glob("/src/routes/**/*(!(*index|*news)).md"));
+  }
+
+  const allContent = await Promise.all(
+    iterableContentFiles.map(async ([path, resolver]) => {
+      const contentPath = path.slice(11, -3);
+      const file = await resolver();
+      const metadata = file.metadata;
+      const today = new Date();
+      
+      if (metadata.notIndexed || (dev ? false : metadata.draft) || (dev ? false : new Date(metadata.date) > today)) {
+        return
+      } else {
+        var html = file.default.render().html
+        var plaintext = convert(html, {
+          baseElements: {
+            orderBy: 'occurrence'
+          },
+          wordwrap: false,
+          selectors: [
+            {selector: 'h1', format: 'skip'},
+            {selector: 'h2', options: {uppercase: false}},
+            {selector: 'a', options: { ignoreHref: true }},
+            {selector: 'a.button', format: 'skip'},
+            {selector: 'a.btn', format: 'skip'},
+            {selector: 'ul', options: {itemPrefix: '- '}},
+            {selector: 'img', format: 'skip'}
+          ]
+        }).replace(/\n\n\n/gm, ' ').replace(/\n\n/g, ' ').replace(/\n/g, ' ').replace(/\"/g,'\'').trim()
+
+        if (metadata && contentPath && plaintext) {
+          return { 
+            meta: metadata,
+            path: contentPath,
+            text: plaintext
+          }
+        }
+      }
+    })
+  )
+  
+  for (let i = 0; i < allContent.length; i++) {
+    if (allContent[i]) {
+      let today = new Date();
+      let postdate = allContent[i].meta.date ? new Date(allContent[i].meta.date) : today
+      let entry = {
+        "title": allContent[i].meta.title,
+        "content": allContent[i].text,
+        "summary": allContent[i].meta.summary,
+        "date": postdate,
+        "slug": allContent[i].path,
+        "categories": allContent[i].meta.categories
+      }
+      indexData.push(entry)
+    } else {
+      continue;
+    }
+  }
+  
+  sortedIndex = indexData.slice().sort((a, b) => (b.date - a.date))
+
+  return sortedIndex
+}

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "tecitheme",
-  "version": "0.1.5",
+  "version": "0.1.8",
   "svelte": true,
   "devDependencies": {
     "@jsdevtools/rehype-toc": "^3.0.2",
     "@sveltejs/adapter-netlify": "1.0.0-next.65",
-    "@sveltejs/kit": "1.0.0-next.358",
+    "@sveltejs/kit": "1.0.0-next.371",
     "@tailwindcss/forms": "^0.5.2",
     "@tailwindcss/typography": "^0.5.2",
     "@types/cookie": "^0.5.1",
@@ -17,7 +17,8 @@
     "eslint": "^8.17.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-svelte3": "^4.0.0",
-    "luxon": "^2.4.0",
+    "html-to-text": "^8.2.0",
+    "markdown-yaml-metadata-parser": "^3.0.0",
     "mdsvex": "^0.10.6",
     "postcss": "^8.4.14",
     "prettier": "^2.6.2",
@@ -26,7 +27,7 @@
     "rehype-slug": "^5.0.1",
     "rehype-stringify": "^9.0.3",
     "stream": "^0.0.2",
-    "svelte": "^3.48.0",
+    "svelte": "^3.49.0",
     "svelte-check": "^2.7.2",
     "svelte-paginate": "^0.0.1",
     "svelte-preprocess": "^4.10.7",
@@ -42,7 +43,8 @@
   "dependencies": {
     "@lukeed/uuid": "^2.0.0",
     "cookie": "^0.5.0",
-    "katex": "^0.15.6"
+    "katex": "^0.15.6",
+    "svelte": "^3.49.0"
   },
   "exports": {
     "./package.json": "./package.json",
@@ -68,6 +70,7 @@
     "./components/TrialForm.svelte": "./components/TrialForm.svelte",
     "./components/Video.svelte": "./components/Video.svelte",
     "./components/Wrap.svelte": "./components/Wrap.svelte",
+    "./get-content": "./get-content.js",
     "./layouts/blocks.svelte": "./layouts/blocks.svelte",
     "./req_utils": "./req_utils.js",
     "./utils": "./utils.js",