From 64eb2987fb1b6463222aa5f0535190f65a6d39a9 Mon Sep 17 00:00:00 2001 From: garrettmills Date: Mon, 16 Jan 2023 03:38:36 -0600 Subject: [PATCH] Add title to pages, update OPML feeds --- src/app/http/controllers/Blog.controller.ts | 7 +++++++ src/app/http/controllers/Home.controller.ts | 1 + src/app/resources/assets/rss_opml.xml | 20 +++++++++----------- src/app/resources/views/template_70s.pug | 5 ++++- 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/src/app/http/controllers/Blog.controller.ts b/src/app/http/controllers/Blog.controller.ts index 1de0908..c90e487 100644 --- a/src/app/http/controllers/Blog.controller.ts +++ b/src/app/http/controllers/Blog.controller.ts @@ -19,6 +19,7 @@ export class Blog extends Controller { return view('blog:index', { ...home.getThemeCSS(), ...this.getBlogData(), + title: 'Garrett\'s Blog', posts: posts.take(10).toArray(), }) } @@ -31,6 +32,7 @@ export class Blog extends Controller { return view('blog:404', { ...home.getThemeCSS(), ...this.getBlogData(), + title: 'Post Not Found', slug, }) } @@ -39,6 +41,7 @@ export class Blog extends Controller { ...home.getThemeCSS(), ...this.getBlogData(), post, + title: post.title, renderedPost: await this.blog.renderPost(post.slug), }) } @@ -51,6 +54,7 @@ export class Blog extends Controller { return view('blog:archive', { ...home.getThemeCSS(), ...this.getBlogData(), + title: 'Archive', postsByYear, postYears: collect(Object.keys(postsByYear)).sortDesc().toArray(), }) @@ -70,6 +74,7 @@ export class Blog extends Controller { return view('blog:tags', { ...home.getThemeCSS(), ...this.getBlogData(), + title: 'Tags', counts, tags: collect(Object.keys(counts)).sort().toArray(), }) @@ -86,6 +91,7 @@ export class Blog extends Controller { return view('blog:tag', { ...home.getThemeCSS(), ...this.getBlogData(), + title: `#${tag}`, posts: posts.toArray(), tag, }) @@ -100,6 +106,7 @@ export class Blog extends Controller { return view('blog:feeds', { ...home.getThemeCSS(), ...this.getBlogData(), + title: 'An RSS Manifesto', subsByCategory, categories, }) diff --git a/src/app/http/controllers/Home.controller.ts b/src/app/http/controllers/Home.controller.ts index 9024d66..f74a89e 100644 --- a/src/app/http/controllers/Home.controller.ts +++ b/src/app/http/controllers/Home.controller.ts @@ -60,6 +60,7 @@ export class Home extends Controller { const isOptOut = this.request.cookies.has(this.config.get('app.analytics.optOutCookie')) return view('technical', { + title: 'Technical Info', isOptOut, ...this.getThemeCSS(), }) diff --git a/src/app/resources/assets/rss_opml.xml b/src/app/resources/assets/rss_opml.xml index 39e556b..d53ed6a 100644 --- a/src/app/resources/assets/rss_opml.xml +++ b/src/app/resources/assets/rss_opml.xml @@ -42,16 +42,23 @@ + + + + + + + - + - + @@ -71,14 +78,5 @@ - - - - - - - - - diff --git a/src/app/resources/views/template_70s.pug b/src/app/resources/views/template_70s.pug index e67319c..8b3c237 100644 --- a/src/app/resources/views/template_70s.pug +++ b/src/app/resources/views/template_70s.pug @@ -10,7 +10,10 @@ head meta(name='robots' content='index, follow') block title - title #{config('app.name', 'Garrett Mills')} | Developer, Speaker, Designer + if title + title #{title} | #{config('app.name', 'Garrett Mills')} + else + title #{config('app.name', 'Garrett Mills')} block style style !{themeCSS}