Add no_index page

tvdeyen · tvdeyen · commit 7bca84bfef79 · 2025-06-03T11:40:13.000+02:00
This page gets displayed when there is no homepage
or the homepage is not published yet.
diff --git a/app/assets/builds/alchemy/welcome.css b/app/assets/builds/alchemy/welcome.css
diff --git a/app/assets/builds/alchemy/welcome.css.map b/app/assets/builds/alchemy/welcome.css.map
diff --git a/app/controllers/alchemy/pages_controller.rb b/app/controllers/alchemy/pages_controller.rb
@@ -106,7 +106,12 @@ def locale_prefix_not_allowed?
     def load_index_page
       @page ||= Language.current_root_page
       Current.page = @page
-      render template: "alchemy/welcome", layout: false if signup_required?
+
+      if signup_required? && @page.nil?
+        render template: "alchemy/welcome", layout: false
+      elsif !@page&.public?
+        render template: "alchemy/no_index", layout: false
+      end
     end
 
     # == Loads page by urlname
@@ -192,7 +197,7 @@ def set_expiration_headers
 
     def signup_required?
       if Alchemy.user_class.respond_to?(:admins)
-        Alchemy.user_class.admins.empty? && @page.nil?
+        Alchemy.user_class.admins.empty?
       end
     end
 
diff --git a/app/stylesheets/alchemy/welcome.scss b/app/stylesheets/alchemy/welcome.scss
@@ -28,6 +28,7 @@ h3 {
 
   img {
     height: 75px;
+    margin-left: -0.35em;
   }
 }
 
diff --git a/app/views/alchemy/no_index.html.erb b/app/views/alchemy/no_index.html.erb
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title><%= Alchemy.t("Welcome to Alchemy") %></title>
+    <%= stylesheet_link_tag("alchemy/welcome", media: "all") %>
+  </head>
+  <body>
+    <div class="container">
+      <%= image_tag("alchemy/alchemy-logo.svg") %>
+      <% if @page.nil? %>
+        <h3>
+          <%= Alchemy.t("There are no pages yet") %>
+        </h3>
+        <p>
+          <%= link_to Alchemy.t("Create your first page"),
+            alchemy.admin_pages_path, class: "button" %>
+        </p>
+      <% else %>
+        <h3>
+          <%= Alchemy.t("There are no published pages yet") %>
+        </h3>
+        <p>
+          <%= link_to Alchemy.t("Publish your homepage"),
+            alchemy.edit_admin_page_path(@page), class: "button" %>
+        </p>
+      <% end %>
+    </div>
+  </body>
+</html>
diff --git a/lib/alchemy/test_support/factories/page_factory.rb b/lib/alchemy/test_support/factories/page_factory.rb
@@ -12,7 +12,7 @@
 
     parent do
       Alchemy::Page.find_by(language_root: true, language: language) ||
-        FactoryBot.create(:alchemy_page, :language_root, language: language)
+        FactoryBot.create(:alchemy_page, :public, :language_root, language: language)
     end
 
     # This speeds up creating of pages dramatically.
@@ -23,7 +23,6 @@
       name { language&.frontpage_name || "Intro" }
       page_layout { language&.page_layout || "index" }
       language_root { true }
-      public_on { Time.current }
       parent { nil }
     end
 
diff --git a/spec/controllers/alchemy/on_page_layout_mixin_spec.rb b/spec/controllers/alchemy/on_page_layout_mixin_spec.rb
@@ -34,7 +34,7 @@
       context "for index action" do
         %w[standard news].each do |page_layout|
           it "runs callback on #{page_layout} layout" do
-            create(:alchemy_page, :language_root, page_layout: page_layout)
+            create(:alchemy_page, :public, :language_root, page_layout: page_layout)
 
             get :index
             expect(assigns(:on_all_layouts)).to eq(page_layout)
@@ -63,7 +63,7 @@
         end
 
         context "for index action" do
-          let!(:page) { create(:alchemy_page, :language_root, page_layout: "standard") }
+          let!(:page) { create(:alchemy_page, :public, :language_root, page_layout: "standard") }
 
           it "runs the callback" do
             get :index
@@ -132,7 +132,7 @@
 
         %w[standard news].each do |page_layout|
           it "runs both callbacks on #{page_layout} layout" do
-            create(:alchemy_page, :language_root, page_layout: page_layout)
+            create(:alchemy_page, :public, :language_root, page_layout: page_layout)
 
             get :index
             expect(assigns(:page_layout)).to eq(page_layout)
@@ -163,7 +163,7 @@
       end
 
       context "for index action" do
-        let!(:page) { create(:alchemy_page, :language_root, page_layout: "standard") }
+        let!(:page) { create(:alchemy_page, :public, :language_root, page_layout: "standard") }
 
         it "runs both callbacks" do
           get :index
@@ -190,7 +190,7 @@
       end
 
       context "for index action" do
-        let!(:page) { create(:alchemy_page, :language_root, page_layout: "standard") }
+        let!(:page) { create(:alchemy_page, :public, :language_root, page_layout: "standard") }
 
         it "evaluates the given block" do
           get :index
@@ -218,7 +218,7 @@ def run_method
       end
 
       context "for index action" do
-        let!(:page) { create(:alchemy_page, :language_root, page_layout: "standard") }
+        let!(:page) { create(:alchemy_page, :public, :language_root, page_layout: "standard") }
 
         it "runs the given callback method" do
           get :index
@@ -257,7 +257,7 @@ def run_method
 
       %w[standard news].each do |page_layout|
         it "evaluates the given callback on both page_layouts for index action" do
-          create(:alchemy_page, :language_root, page_layout: page_layout)
+          create(:alchemy_page, :public, :language_root, page_layout: page_layout)
 
           get :index
           expect(assigns(:successful)).to eq(page_layout)
diff --git a/spec/controllers/alchemy/pages_controller_spec.rb b/spec/controllers/alchemy/pages_controller_spec.rb
@@ -10,7 +10,7 @@ module Alchemy
     let(:default_language) { create(:alchemy_language) }
 
     let(:default_language_root) do
-      create(:alchemy_page, :language_root, language: default_language, name: "Home")
+      create(:alchemy_page, :public, :language_root, language: default_language, name: "Home")
     end
 
     let(:page) do
@@ -29,11 +29,8 @@ module Alchemy
 
     describe "#index" do
       context "without a site or language present" do
-        it "returns a 404" do
-          expect { get(:index) }.to raise_exception(
-            ActionController::RoutingError,
-            'Alchemy::Page not found "/"'
-          )
+        it "returns a no_index page" do
+          expect(get(:index)).to render_template("alchemy/no_index")
         end
       end
 
@@ -57,10 +54,8 @@ module Alchemy
               create(:alchemy_page, :language_root, public_on: nil, language: default_language, name: "Home")
             end
 
-            it "raises routing error (404)" do
-              expect {
-                get :index
-              }.to raise_error(ActionController::RoutingError)
+            it "returns a no_index page" do
+              expect(get(:index)).to render_template("alchemy/no_index")
             end
 
             context "when a page layout callback is set" do
@@ -71,10 +66,8 @@ module Alchemy
                 end
               end
 
-              it 'raises routing error (404) and no "undefined method for nil" error' do
-                expect {
-                  get :index
-                }.to raise_error(ActionController::RoutingError)
+              it 'does not raise "undefined method for nil" error' do
+                expect { get :index }.to_not raise_error
               end
             end
           end
diff --git a/spec/features/page_feature_spec.rb b/spec/features/page_feature_spec.rb

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ h3 {`
`28`	`28`
`29`	`29`	`img {`
`30`	`30`	`height: 75px;`
	`31`	`+ margin-left: -0.35em;`
`31`	`32`	`}`
`32`	`33`	`}`
`33`	`34`