use old path

EndangeredMassa · Sep 30, 2023 · f81e3b6 · f81e3b6
1 parent 0fc1212
commit f81e3b6
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -3,6 +3,5 @@
 ## To Do
 
 - clean up styling
-- add redirects for old slug to new slug
 - 404 protection: https://remysharp.com/2023/09/26/no-more-404
 - add search: https://pagefind.app/
diff --git a/app/components/article-card.gjs b/app/components/article-card.gjs
@@ -3,7 +3,7 @@ import { LinkTo } from '@ember/routing';
 <template>
   <div class="blog-item">
     <LinkTo class="post-link"
-      @route='article'
+      @route="article"
       @model={{@article}}>
         {{@article.title}}
     </LinkTo>

diff --git a/app/router.js b/app/router.js
@@ -15,9 +15,9 @@ Router.map(function () {
     this.route('index', { path: '/' });
   })
 
-  this.route('articles', function() {
+  this.route('blog', function() {
     this.route('index', { path: '/' });
   });
 
-  this.route('article', { path: '/articles/:slug' });
+  this.route('article', { path: '/blog/:slug' });
 });
diff --git a/app/routes/article.js b/app/routes/article.js
@@ -1,20 +1,24 @@
 import Route from '@ember/routing/route';
 import articles from '../article-data';
 
-export default class ArticlesArticleRoute extends Route {
+export default class BlogRoute extends Route {
   beforeModel(transition) {
     // set the proper template
 
     let slug;
     if (transition.intent.url) {
       // direct load
-      slug = transition.intent.url.replace('/articles/', '');
+      slug = transition.intent.url.replace('/blog/', '');
     } else {
       // linked load
-      slug = transition.routeInfos[1].context.slug;
+      const info = transition.routeInfos[1];
+
+      slug = info?.context?.slug || info?.params?.slug;
     }
 
-    this.templateName = `articles.${slug}`;
+    if (slug) {
+      this.templateName = `article.${slug}`;
+    }
   }
 
   model(params) {

diff --git a/app/templates/application.gjs b/app/templates/application.gjs
@@ -8,7 +8,7 @@ class MyRouteComponent extends Component {
     <header>
       <nav>
         <LinkTo @route="index">Home</LinkTo>
-        <LinkTo @route="articles">Articles</LinkTo>
+        <LinkTo @route="blog">Blog</LinkTo>
         <LinkTo @route="talks">Talks</LinkTo>
         <LinkTo @route="projects">Projects</LinkTo>
       </nav>

diff --git a/...mplates/articles/conventional-comments.md → ...emplates/article/conventional-comments.md b/...mplates/articles/conventional-comments.md → ...emplates/article/conventional-comments.md
diff --git a/...es/articles/detangling-the-code-review.md → ...tes/article/detangling-the-code-review.md b/...es/articles/detangling-the-code-review.md → ...tes/article/detangling-the-code-review.md
diff --git a/...plates/articles/detangling-the-manager.md → ...mplates/article/detangling-the-manager.md b/...plates/articles/detangling-the-manager.md → ...mplates/article/detangling-the-manager.md
diff --git a/...plates/articles/detangling-the-standup.md → ...mplates/article/detangling-the-standup.md b/...plates/articles/detangling-the-standup.md → ...mplates/article/detangling-the-standup.md
diff --git a/...mplates/articles/developers-guide-a11y.md → ...emplates/article/developers-guide-a11y.md b/...mplates/articles/developers-guide-a11y.md → ...emplates/article/developers-guide-a11y.md
diff --git a/...articles/how-to-start-linting-projects.md → .../article/how-to-start-linting-projects.md b/...articles/how-to-start-linting-projects.md → .../article/how-to-start-linting-projects.md
diff --git a/app/templates/articles/theme-pact.md → app/templates/article/theme-pact.md b/app/templates/articles/theme-pact.md → app/templates/article/theme-pact.md
diff --git a/app/templates/articles.gjs → app/templates/blog.gjs b/app/templates/articles.gjs → app/templates/blog.gjs
diff --git a/lib/scan-dir.js b/lib/scan-dir.js
@@ -13,13 +13,13 @@ module.exports = async function ({ distDir, visit }) {
     .replace('export default articles;', '');
   let articles = JSON.parse(trimmedArticleData);
   let articleUrls = articles.map((a) => {
-    return '/articles/' + a.slug.replace(/\./g, '/');
+    return '/blog/' + a.slug.replace(/\./g, '/');
   });
 
   return [
     '/',
     '/talks',
-    '/articles',
+    '/blog',
     '/projects',
     ...articleUrls
   ];