Move angular-templates route and controller into Web engine

The route and controller were in the main app and the views in the engine, with this commit they stay all inside the engine This is done to keep it simple and remove the unnecessary dependency between main app and engine If we use this mechanism in the future for other things in the main app or other engines, we can find a way to extract/abstract this
openfoodfoundation · Sep 26, 2018 · 9211053 · 9211053
1 parent b1c7e6c
commit 9211053
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 7 deletions.
diff --git a/app/controllers/angular_templates_controller.rb b/app/controllers/angular_templates_controller.rb
diff --git a/config/routes.rb b/config/routes.rb
@@ -88,8 +88,6 @@
   get '/:id/shop', to: 'enterprises#shop', as: 'enterprise_shop'
   get "/enterprises/:permalink", to: redirect("/") # Legacy enterprise URL
 
-  get "/angular-templates/:id", to: "angular_templates#show", constraints: { name: %r{[\/\w\.]+} }
-
   namespace :api do
     resources :enterprises do
       post :update_image, on: :member

diff --git a/engines/web/app/controllers/web/angular_templates_controller.rb b/engines/web/app/controllers/web/angular_templates_controller.rb
@@ -0,0 +1,9 @@
+module Web
+  class AngularTemplatesController < ApplicationController
+    helper Web::Engine.helpers
+
+    def show
+      render params[:id].to_s, layout: nil
+    end
+  end
+end
diff --git a/...templates/_cookies_policy_entry.html.haml → ...templates/_cookies_policy_entry.html.haml b/...templates/_cookies_policy_entry.html.haml → ...templates/_cookies_policy_entry.html.haml
diff --git a/...ngular_templates/cookies_banner.html.haml → ...ngular_templates/cookies_banner.html.haml b/...ngular_templates/cookies_banner.html.haml → ...ngular_templates/cookies_banner.html.haml
diff --git a/...ngular_templates/cookies_policy.html.haml → ...ngular_templates/cookies_policy.html.haml b/...ngular_templates/cookies_policy.html.haml → ...ngular_templates/cookies_policy.html.haml
diff --git a/engines/web/config/routes.rb b/engines/web/config/routes.rb
@@ -4,4 +4,6 @@
       resource :consent, only: [:show, :create, :destroy], controller: "cookies_consent"
     end
   end
+
+  get "/angular-templates/:id", to: "angular_templates#show", constraints: { name: %r{[\/\w\.]+} }
 end
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,4 +4,6 @@ @@
           resource :consent, only: [:show, :create, :destroy], controller: "cookies_consent"
         end
       end
+      get "/angular-templates/:id", to: "angular_templates#show", constraints: { name: %r{[\/\w\.]+} }
     end