rename blog -> article

libs/types/src/config/routing.d.ts

@@ -1,5 +1,5 @@
 import { Router } from 'vue-router'
-import { BlogEntry } from '../content/templates/blog-list'
+import { ArticleEntry } from '../content/templates/article-list'
 import { GalleryEntry } from '../content/templates/gallery-list'
 import { TemplateType } from '../content/templates/templateType'
 import { WarningModal } from './warnings'
@@ -39,10 +39,10 @@ export type MarkdownDefinition = ContentfulRouteDefintion & {
 }
 
 /**
- * Defines the config for a route using the `blog-list` {@link TemplateType}
+ * Defines the config for a route using the `article-list` {@link TemplateType}
  */
-export type BlogListDefinition = ConfigfulRouteDefinition & {
+export type ArticleListDefinition = ConfigfulRouteDefinition & {
-  template: 'blog-list'
+  template: 'article-list'
   view: {
     stylesheetUrls: string[]
   }
@@ -63,7 +63,7 @@ export type GalleryListDefinition = ConfigfulRouteDefinition & {
  */
 export type RouteDefinition =
   | MarkdownDefinition
-  | BlogListDefinition
+  | ArticleListDefinition
   | GalleryListDefinition
 
 /**
@@ -77,9 +77,9 @@ export type RouteCollection = { [key: string]: RouteDefinition }
 export interface RoutedWindow extends Window {
   /** refers to a template's primary route config; may briefly refer to sub config until a view is fully resolved */
   routeConfig: RouteDefinition
-  /** refers to a template's sub config in the case of child routes under a template (e.g. blog-view under blog-list) */
+  /** refers to a template's sub config in the case of child routes under a template (e.g. article-view under article-list) */
   routeSubConfig: any
-  /** refers to content config for various view routes (e.g. {@link GalleryEntry}, {@link BlogEntry}, etc.) */
+  /** refers to content config for various view routes (e.g. {@link GalleryEntry}, {@link ArticleEntry}, etc.) */
   routeContentConfig: any
   /** vue-router instance */
   router?: Router

libs/types/src/content/entryTag.d.ts

@@ -1,5 +1,5 @@
 /**
- * Defines a tag used by entries in a gallery-list/blog-list,
+ * Defines a tag used by entries in a gallery-list/article-list,
  * used for filtering entries from view
  */
 export type EntryTag = {
@@ -19,11 +19,11 @@ export type EntryTag = {
 }
 
 /**
- * Defines the list of tags in a gallery-list/blog-list,
+ * Defines the list of tags in a gallery-list/article-list,
  * a key-value object where the value is the entry,
  * and the key represents the id of a tag;
  * the id of a tag must be unique,
- * and the ids specified in a gallery/blog entry must match
+ * and the ids specified in a gallery/article entry must match
  * the ids specified in `EntryTagCollection` in order for them to work effectively
  */
 export type EntryTagCollection = { [id: string]: EntryTag }

libs/types/src/content/templates/article-list.d.ts

@@ -0,0 +1,12 @@
+import type { MediaEntry } from './shared'
+
+/**
+ * This describes additional information about a article entry
+ * to display when listing the entry on the article-list page.
+ */
+export type ArticleEntry = {
+  /**
+   * URL to the markdown document of the article entry
+   */
+  url: string
+} & MediaEntry

libs/types/src/content/templates/blog-list.d.ts

@@ -1,12 +0,0 @@
-import type { MediaEntry } from './shared'
-
-/**
- * This describes additional information about a blog entry
- * to display when listing the entry on the blog-list page.
- */
-export type BlogEntry = {
-  /**
-   * URL to the markdown document of the blog entry
-   */
-  url: string
-} & MediaEntry

libs/types/src/content/templates/templateType.d.ts

@@ -4,5 +4,5 @@
  */
 export type TemplateType = 
   | 'markdown'
-  | 'blog-list'
+  | 'article-list'
   | 'gallery-list'

libs/types/src/index.d.ts

@@ -8,7 +8,7 @@ export * from './content/dateRange'
 export * from './content/entryTag'
 export * from './content/link'
 
-export * from './content/templates/blog-list'
+export * from './content/templates/article-list'
 export * from './content/templates/gallery-list'
 export * from './content/templates/shared'
 export * from './content/templates/templateType'

projects/frontend/src/routes.ts

@@ -5,20 +5,20 @@ import type {
   GalleryListDefinition,
   HeaderEntry,
   Link,
-  BlogListDefinition,
+  ArticleListDefinition,
   RouteDefinition,
   SiteGlobals,
   TemplateType,
 } from '@goldenwere/mackenzii-types'
 
 const markdownBody = () => import ('./views/markdown/markdown.vue')
-const blogViewBody = () => import ('./views/blog/blog-view.vue')
+const articleViewBody = () => import ('./views/article/article-view.vue')
 const galleryViewBody = () => import ('./views/gallery/gallery-view.vue')
 const mediaListBody = () => import ('./views/shared/media-list.vue')
 
 export const templates: Record<TemplateType, () => Promise<any>> = {
   'markdown': markdownBody,
-  'blog-list': mediaListBody,
+  'article-list': mediaListBody,
   'gallery-list': mediaListBody,
 }
 
@@ -32,11 +32,11 @@ export const createRoutes = (): RouteRecordRaw[] => {
       component: templates[routes[route].template],
     }
 
-    if (routes[route].template === 'blog-list') {
+    if (routes[route].template === 'article-list') {
       routeRecord.push({
-        name: `${routes[route].id}: View Blog`,
+        name: `${routes[route].id}: View Article`,
         path: `${route}/view`,
-        component: blogViewBody,
+        component: articleViewBody,
         props: route => ({ id: route.query.id }),
       })
     } else if (routes[route].template === 'gallery-list') {
@@ -145,10 +145,10 @@ export const initializeRouteStore = (routerRoutes: readonly RouteRecordRaw[]) =>
       ...routerRoutes.find(other => other.path === route) as RouteRecordRaw,
       ...routes[route] as RouteDefinition,
     }
-    if (routes[route].template === 'blog-list' || routes[route].template === 'gallery-list') {
+    if (routes[route].template === 'article-list' || routes[route].template === 'gallery-list') {
       routeStore._routes[`${route}/view`] = {
         ...routerRoutes.find(other => other.path === `${route}/view`) as RouteRecordRaw,
-        ...(routes[route] as BlogListDefinition | GalleryListDefinition).view,
+        ...(routes[route] as ArticleListDefinition | GalleryListDefinition).view,
       } as any
     }
   })

projects/frontend/src/views/article/article-tile.vue

@@ -3,17 +3,17 @@ import { computed, onMounted, ref } from 'vue'
 import { marked } from 'marked'
 import { getFormattedDate } from 'src/utilities/parse'
 import type { 
-  BlogEntry,
+  ArticleEntry,
 } from '@goldenwere/mackenzii-types'
 
 const props = defineProps<{
   id: string,
   viewPath: string,
   isInternal: boolean,
-  entry: Promise<BlogEntry>
+  entry: Promise<ArticleEntry>
 }>()
 
-const resolved = ref({} as BlogEntry)
+const resolved = ref({} as ArticleEntry)
 const thumbnail = computed(() => resolved.value.thumbnail)
 const description = computed(() => marked.parse(resolved.value.description || ''))
 const date = computed(() => !!resolved.value.date ? getFormattedDate(resolved.value.date) : null)
@@ -46,7 +46,7 @@ mixin embedText
       v-if='date'
     )
       span {{ date }}
-.blog-embed
+.article-embed
   .thumbnail-wrapper(
     v-if='!!thumbnail'
   )

projects/frontend/src/views/article/article-view.vue

@@ -2,8 +2,8 @@
 import { onMounted, ref } from 'vue'
 import type { 
   ListWithEntries,
-  BlogEntry,
+  ArticleEntry,
-  BlogListDefinition,
+  ArticleListDefinition,
   RoutedWindow,
 } from '@goldenwere/mackenzii-types'
 
@@ -20,15 +20,15 @@ const emits = defineEmits<{
 }>()
 
 const ready = ref(false)
-const resolved = ref({} as BlogEntry)
+const resolved = ref({} as ArticleEntry)
 const content = ref('')
 const currentRoute = getCurrentRoute()
 const routeStore = useRouteStore()
-const routeConfig = routeStore._routes[currentRoute.path.substring(0, currentRoute.path.length - 5)] as BlogListDefinition
+const routeConfig = routeStore._routes[currentRoute.path.substring(0, currentRoute.path.length - 5)] as ArticleListDefinition
 const routeSubConfig = routeStore._routes[currentRoute.path]
 
 onMounted(async () => {
-  const config = await fetchAndParseYaml<ListWithEntries<BlogEntry>>(routeConfig.config)
+  const config = await fetchAndParseYaml<ListWithEntries<ArticleEntry>>(routeConfig.config)
     resolved.value = await fetchConfigByIdFromList(config, currentRoute.query.id as string)
   const md = await fetchAndParseMarkdown(resolved.value.url)
   content.value = md
@@ -44,7 +44,7 @@ onMounted(async () => {
 </script>
 
 <template lang="pug">
-.template.blog-view
+.template.article-view
   Transition
     article(
       v-if='ready'

projects/frontend/src/views/shared/media-list.vue

@@ -12,7 +12,7 @@ import { useRouteStore } from 'src/routes'
 
 import FilterPanel from 'src/components/shared/filter-panel.vue'
 import GalleryTile from '../gallery/gallery-tile.vue'
-import BlogTile from '../blog/blog-tile.vue'
+import ArticleTile from '../article/article-tile.vue'
 
 type MediaList = ListWithTags<MediaEntry>
 
@@ -46,9 +46,9 @@ const className = computed(() => {
     case 'gallery-list': {
       return 'gallery'
     }
-    case 'blog-list':
+    case 'article-list':
     default: {
-      return 'blog'
+      return 'article'
     }
   }
 })
@@ -135,8 +135,8 @@ onMounted(async () => {
           :isInternal='true'
           :entry='entry'
         )
-        BlogTile(
+        ArticleTile(
-          v-else-if='template === "blog-list" && (!entry.isHidden || !config.removeFromView)'
+          v-else-if='template === "article-list" && (!entry.isHidden || !config.removeFromView)'
           :class='{ hidden: entry.isHidden && !config.removeFromView }'
           :hideWarnings='hideWarnings'
           :id='id'