move articles under blog for active link support

EndangeredMassa · Jan 15, 2024 · 19bdbec · 19bdbec
1 parent bc5a4c7
commit 19bdbec
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 8 deletions.
diff --git a/app/components/article-card.gjs b/app/components/article-card.gjs
@@ -4,7 +4,7 @@ import { LinkTo } from '@ember/routing';
   <div class="blog-item">
     <h2>
       <LinkTo class="post-link"
-        @route="article"
+        @route="blog.article"
         @model={{@article}}>
           {{@article.title}}
       </LinkTo>

diff --git a/app/router.js b/app/router.js
@@ -16,8 +16,7 @@ Router.map(function () {
   })
 
   this.route('blog', function() {
+    this.route('article', { path: '/:slug' });
     this.route('index', { path: '/' });
   });
-
-  this.route('article', { path: '/blog/:slug' });
 });
diff --git a/app/routes/article.js → app/routes/blog/article.js b/app/routes/article.js → app/routes/blog/article.js
@@ -1,5 +1,5 @@
 import Route from '@ember/routing/route';
-import articles from '../article-data';
+import articles from '../../article-data';
 
 export default class BlogRoute extends Route {
   beforeModel(transition) {
@@ -11,13 +11,13 @@ export default class BlogRoute extends Route {
       slug = transition.intent.url.replace('/blog/', '');
     } else {
       // linked load
-      const info = transition.routeInfos[1];
+      const info = transition.routeInfos[2];
 
       slug = info?.context?.slug || info?.params?.slug;
     }
 
     if (slug) {
-      this.templateName = `article.${slug}`;
+      this.templateName = `blog.article.${slug}`;
     }
   }
 

diff --git a/...emplates/article/conventional-comments.md → ...tes/blog/article/conventional-comments.md b/...emplates/article/conventional-comments.md → ...tes/blog/article/conventional-comments.md
diff --git a/...tes/article/detangling-the-code-review.md → ...log/article/detangling-the-code-review.md b/...tes/article/detangling-the-code-review.md → ...log/article/detangling-the-code-review.md
diff --git a/...mplates/article/detangling-the-manager.md → ...es/blog/article/detangling-the-manager.md b/...mplates/article/detangling-the-manager.md → ...es/blog/article/detangling-the-manager.md
diff --git a/...mplates/article/detangling-the-standup.md → ...es/blog/article/detangling-the-standup.md b/...mplates/article/detangling-the-standup.md → ...es/blog/article/detangling-the-standup.md
diff --git a/...emplates/article/developers-guide-a11y.md → ...tes/blog/article/developers-guide-a11y.md b/...emplates/article/developers-guide-a11y.md → ...tes/blog/article/developers-guide-a11y.md
diff --git a/.../article/how-to-start-linting-projects.md → .../article/how-to-start-linting-projects.md b/.../article/how-to-start-linting-projects.md → .../article/how-to-start-linting-projects.md
diff --git a/app/templates/article/theme-pact.md → app/templates/blog/article/theme-pact.md b/app/templates/article/theme-pact.md → app/templates/blog/article/theme-pact.md
diff --git a/app/templates/blog.gjs → app/templates/blog/index.gjs b/app/templates/blog.gjs → app/templates/blog/index.gjs
@@ -1,6 +1,6 @@
 import RouteTemplate from 'ember-route-template';
-import ArticleCard from '../components/article-card';
-import articles from '../article-data';
+import ArticleCard from '../../components/article-card';
+import articles from '../../article-data';
 
 export default RouteTemplate(
 <template>