repair categories and tags

reednel · Aug 8, 2023 · 2c91508 · 2c91508
1 parent 0915aeb
commit 2c91508
Show file tree

Hide file tree

Showing 33 changed files with 78 additions and 279 deletions.
diff --git a/public/assets/favicon.ico b/public/assets/favicon.ico
diff --git a/public/images/call-to-action.png b/public/images/call-to-action.png
diff --git a/public/images/favicon.png b/public/images/favicon.png
diff --git a/public/images/service-1.png b/public/images/service-1.png
diff --git a/public/images/service-2.png b/public/images/service-2.png
diff --git a/public/images/service-3.png b/public/images/service-3.png
diff --git a/src/config/config.json b/src/config/config.json
@@ -4,28 +4,28 @@
     "base_url": "https://reednel.com",
     "base_path": "/",
     "trailing_slash": false,
-    "favicon": "/images/favicon.png",
+    "favicon": "/assets/favicon.ico",
     "logo": "/images/logo.png",
     "logo_darkmode": "/images/logo-darkmode.png",
     "logo_width": "150",
     "logo_height": "30",
-    "logo_text": "Pages"
+    "logo_text": "rn"
   },
 
   "settings": {
     "search": true,
-    "sticky_header": true,
+    "sticky_header": false,
     "theme_switcher": true,
     "default_theme": "system",
     "pagination": 2,
     "summary_length": 200,
     "blog_folder": "blog",
-    "drink_folder": "drinks"
+    "drink_folder": "drink"
   },
 
   "metadata": {
     "meta_author": "reednel",
     "meta_image": "/images/og-image.png",
-    "meta_description": "astro and tailwind boilerplate"
+    "meta_description": "Reed Nelson's perosnal website"
   }
 }
diff --git a/src/content/config.ts b/src/content/config.ts
@@ -15,7 +15,7 @@ const blogCollection = defineCollection({
   }),
 });
 
-// Drinks collection schema
+// Drink collection schema
 const drinkCollection = defineCollection({
   schema: z.object({
     title: z.string(),
@@ -67,7 +67,7 @@ const pagesCollection = defineCollection({
 // Export collections
 export const collections = {
   blog: blogCollection,
-  drinks: drinkCollection,
+  drink: drinkCollection,
   projects: projectCollection,
   pages: pagesCollection,
 };
diff --git a/src/content/drinks/-index.md → src/content/drink/-index.md b/src/content/drinks/-index.md → src/content/drink/-index.md
diff --git a/src/content/drinks/drink1.md → src/content/drink/drink1.md b/src/content/drinks/drink1.md → src/content/drink/drink1.md
diff --git a/src/content/drinks/drink2.md → src/content/drink/drink2.md b/src/content/drinks/drink2.md → src/content/drink/drink2.md
diff --git a/src/content/drinks/drink3.md → src/content/drink/drink3.md b/src/content/drinks/drink3.md → src/content/drink/drink3.md
diff --git a/src/content/pages/elements.mdx b/src/content/pages/elements.mdx
diff --git a/src/layouts/PostSingle.astro b/src/layouts/PostSingle.astro
@@ -49,7 +49,7 @@ const { title, description, author, categories, image, date, tags } = post.data;
             <FaRegFolder className={"mr-2 -mt-1 inline-block"} />
             {
               categories.map((category: string, index: number) => (
-                <a href={`/categories/${slugify(category)}`}>
+                <a href={`/blog/categories/${slugify(category)}`}>
                   {humanize(category)}
                   {index !== categories.length - 1 && ","}
                 </a>

diff --git a/src/layouts/Search.tsx b/src/layouts/Search.tsx
@@ -147,7 +147,7 @@ const Search = ({ searchList }: Props) => {
                       {item.data.categories.map(
                         (category: string, index: number) => (
                           <a
-                            href={`/categories/${slugify(category)}`}
+                            href={`/blog/categories/${slugify(category)}`}
                             key={category}
                           >
                             {humanize(category)}

diff --git a/src/layouts/components/BlogCard.astro b/src/layouts/components/BlogCard.astro
@@ -39,7 +39,7 @@ const { title, image, date, author, categories } = data.data;
       <FaRegFolder className={"mr-2 -mt-1 inline-block"} />
       {
         categories.map((category: string, index: number) => (
-          <a href={`/categories/${slugify(category)}`}>
+          <a href={`/blog/categories/${slugify(category)}`}>
             {humanize(category)}
             {index !== categories.length - 1 && ","}
           </a>

diff --git a/src/layouts/components/DrinkCard.astro b/src/layouts/components/DrinkCard.astro
@@ -39,7 +39,7 @@ const { title, image, date, author, categories } = data.data;
       <FaRegFolder className={"mr-2 -mt-1 inline-block"} />
       {
         categories.map((category: string, index: number) => (
-          <a href={`/categories/${slugify(category)}`}>
+          <a href={`/drink/categories/${slugify(category)}`}>
             {humanize(category)}
             {index !== categories.length - 1 && ","}
           </a>

diff --git a/src/layouts/partials/PostSidebar.astro → src/layouts/partials/BlogSidebar.astro b/src/layouts/partials/PostSidebar.astro → src/layouts/partials/BlogSidebar.astro
@@ -19,7 +19,7 @@ const { tags, categories, allCategories } = Astro.props;
               <li>
                 <a
                   class="flex justify-between hover:text-primary dark:hover:text-darkmode-primary"
-                  href={`/categories/${category}`}
+                  href={`/blog/categories/${category}`}
                 >
                   {humanize(category)} <span>({count})</span>
                 </a>
@@ -41,7 +41,7 @@ const { tags, categories, allCategories } = Astro.props;
               <li class="inline-block">
                 <a
                   class="m-1 block rounded bg-white px-3 py-1 hover:bg-primary hover:text-white dark:bg-darkmode-body dark:hover:bg-darkmode-primary dark:hover:text-dark"
-                  href={`/tags/${tag}`}
+                  href={`blog/tags/${tag}`}
                 >
                   {humanize(tag)}
                 </a>