Skip to content

Commit bf12e4e

Browse files
authored
refactor: move partials generator to eject (#317)
1 parent 31cd129 commit bf12e4e

File tree

10 files changed

+9
-80
lines changed

10 files changed

+9
-80
lines changed

app/helpers/avo/application_helper.rb

-24
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,6 @@ def current_webpacker_instance
77
Avo.webpacker
88
end
99

10-
def render_logo
11-
render partial: "vendor/avo/partials/logo"
12-
rescue
13-
render partial: "avo/partials/logo"
14-
end
15-
16-
def render_header
17-
render partial: "vendor/avo/partials/header"
18-
rescue
19-
render partial: "avo/partials/header"
20-
end
21-
22-
def render_footer
23-
render partial: "vendor/avo/partials/footer"
24-
rescue
25-
render partial: "avo/partials/footer"
26-
end
27-
28-
def render_scripts
29-
render partial: "vendor/avo/partials/scripts"
30-
rescue
31-
""
32-
end
33-
3410
def render_license_warnings
3511
render partial: "avo/sidebar/license_warnings", locals: {
3612
license: Avo::App.license.properties

app/views/avo/sidebar/_sidebar.html.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="application-sidebar flex h-full bg-white text-white w-56 z-50 border-r border-gray-300">
22
<div class="flex flex-col w-full">
33
<%= link_to root_path, class: 'logo-placeholder h-16 bg-white p-2 flex justify-center' do %>
4-
<%= render_logo %>
4+
<%= render partial: "avo/partials/logo" %>
55
<% end %>
66

77
<div class="flex-1 flex flex-col justify-between">

app/views/layouts/avo/application.html.erb

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<div class="flex-1 flex flex-col h-full overflow-auto">
2121
<div class="relative bg-white p-2 shadow-md h-16 w-full flex flex-shrink-0 items-center z-50" v-if="layout !== 'blank'">
2222
<div class="ml-6">
23-
<%= render_header %>
23+
<%= render partial: "avo/partials/header" %>
2424
</div>
2525
<div class="flex-1 flex justify-center">
2626
<div class="w-64">
@@ -31,7 +31,7 @@
3131

3232
<div class="content p-8 flex-1 flex flex-col justify-between items-stretch <%= @container_classes %>">
3333
<%= yield %>
34-
<%= render_footer %>
34+
<%= render partial: "avo/partials/footer" %>
3535
</div>
3636
</div>
3737
</div>
@@ -44,6 +44,6 @@
4444
<% end %>
4545
</div>
4646

47-
<%= render_scripts %>
47+
<%= render partial: "avo/partials/footer" %>
4848
</body>
4949
</html>

lib/generators/avo/eject_generator.rb

+5-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ class EjectGenerator < ::Rails::Generators::Base
1111
namespace "avo:eject"
1212

1313
TEMPLATES = {
14-
sidebar: "app/views/avo/sidebar/_sidebar.html.erb"
14+
sidebar: "app/views/avo/sidebar/_sidebar.html.erb",
15+
logo: "app/views/avo/partials/logo.html.erb",
16+
header: "app/views/avo/partials/header.html.erb",
17+
footer: "app/views/avo/partials/footer.html.erb",
18+
scripts: "app/views/avo/partials/scripts.html.erb"
1519
}
1620

1721
def handle

lib/generators/avo/partials_generator.rb

-14
This file was deleted.

lib/generators/avo/templates/partials/_footer.html.erb

-3
This file was deleted.

lib/generators/avo/templates/partials/_header.html.erb

-1
This file was deleted.

lib/generators/avo/templates/partials/_logo.html.erb

-1
This file was deleted.

spec/dummy/app/views/avo/sidebar/_sidebar.html.erb

-32
This file was deleted.

0 commit comments

Comments
 (0)