From 637963a8a2f140d20eec009b7e4ba2bd9d378af1 Mon Sep 17 00:00:00 2001 From: Todd Kummer Date: Wed, 9 Oct 2024 11:22:09 -0700 Subject: [PATCH] Update nav bar to support links from metadata --- src/_components/shared/.keep | 0 src/_components/shared/navbar.erb | 2 -- src/_components/shared/navbar.rb | 5 ----- src/_data/site_metadata.yml | 8 ++++++++ src/_layouts/default.erb | 2 +- src/_layouts/post.erb | 15 +++++++++++++-- src/_partials/_head.erb | 6 +++--- src/_partials/_navbar.erb | 14 ++++++++++++++ 8 files changed, 39 insertions(+), 13 deletions(-) create mode 100644 src/_components/shared/.keep delete mode 100644 src/_components/shared/navbar.erb delete mode 100644 src/_components/shared/navbar.rb create mode 100644 src/_partials/_navbar.erb diff --git a/src/_components/shared/.keep b/src/_components/shared/.keep new file mode 100644 index 0000000..e69de29 diff --git a/src/_components/shared/navbar.erb b/src/_components/shared/navbar.erb deleted file mode 100644 index 3bdb108..0000000 --- a/src/_components/shared/navbar.erb +++ /dev/null @@ -1,2 +0,0 @@ - diff --git a/src/_components/shared/navbar.rb b/src/_components/shared/navbar.rb deleted file mode 100644 index 53e3416..0000000 --- a/src/_components/shared/navbar.rb +++ /dev/null @@ -1,5 +0,0 @@ -class Shared::Navbar < Bridgetown::Component - def initialize(metadata:, resource:) - @metadata, @resource = metadata, resource - end -end diff --git a/src/_data/site_metadata.yml b/src/_data/site_metadata.yml index 30ef0d5..f4267b7 100644 --- a/src/_data/site_metadata.yml +++ b/src/_data/site_metadata.yml @@ -11,3 +11,11 @@ description: >- Rockridge Solutions is a boutique software consulting firm that has been helping clients tell the story of their businesses for 20 years. Let Todd and John leverage the power of Ruby on Rails to help tell your story. + +menu: + # home: + # - name: Blog + # url: "/posts" + post: + - name: Rockridge Solutions + url: "/" diff --git a/src/_layouts/default.erb b/src/_layouts/default.erb index 7f62dcf..4256243 100644 --- a/src/_layouts/default.erb +++ b/src/_layouts/default.erb @@ -4,7 +4,7 @@ <%= render "head", metadata: site.metadata, title: data.title %> - <%= render Shared::Navbar.new(metadata: site.metadata, resource: resource) %> + <%= render "navbar", links: site.metadata.menu[data.layout] %>
<%= yield %> diff --git a/src/_layouts/post.erb b/src/_layouts/post.erb index aa8e166..db910c7 100644 --- a/src/_layouts/post.erb +++ b/src/_layouts/post.erb @@ -2,6 +2,17 @@ layout: default --- -

<%= data.title %>

+
+
+

<%= data.title %>

+

<%= data.subtitle %>

+
+
-<%= yield %> +
+
+
+ <%= yield %> +
+
+
diff --git a/src/_partials/_head.erb b/src/_partials/_head.erb index c2697e9..ae0205f 100644 --- a/src/_partials/_head.erb +++ b/src/_partials/_head.erb @@ -11,8 +11,8 @@ - - - + + + <%= live_reload_dev_js %> diff --git a/src/_partials/_navbar.erb b/src/_partials/_navbar.erb new file mode 100644 index 0000000..a194be5 --- /dev/null +++ b/src/_partials/_navbar.erb @@ -0,0 +1,14 @@ +