Skip to content

Commit 7da5b5b

Browse files
karinevieirakarinevieira
authored
Remove 'helpers' prefix (#162)
1 parent 4ae84ff commit 7da5b5b

21 files changed

+99
-105
lines changed

‎app/components/base.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ class Components::Base < Phlex::HTML
44

55
# Include any helpers you want to be available across all components
66
include Phlex::Rails::Helpers::Routes
7+
include Phlex::Rails::Helpers::ImagePath
8+
include Phlex::Rails::Helpers::ImageURL
9+
include Phlex::Rails::Helpers::Flash
10+
include Phlex::Rails::Helpers::Request
711

812
TAILWIND_MERGER = ::TailwindMerge::Merger.new.freeze unless defined?(TAILWIND_MERGER)
913

‎app/views/components/shared/logo.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
class Shared::Logo < ApplicationComponent
44
def view_template
5-
a(href: helpers.root_url, class: "mr-6 flex items-center space-x-2") do
5+
a(href: root_url, class: "mr-6 flex items-center space-x-2") do
66
Heading(level: 4, class: "flex items-center") {
7-
img(src: helpers.image_url("logo.svg"), class: "h-4 block dark:hidden")
8-
img(src: helpers.image_url("logo_dark.svg"), class: "h-4 hidden dark:block")
7+
img(src: image_url("logo.svg"), class: "h-4 block dark:hidden")
8+
img(src: image_url("logo_dark.svg"), class: "h-4 hidden dark:block")
99
span(class: "sr-only") { "RubyUI" }
1010
Badge(variant: :amber, size: :sm, class: "ml-2 whitespace-nowrap") { "Pre Release" }
1111
}

‎app/views/components/shared/menu.rb

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ def view_template
55
div(class: "pb-4") do
66
# Main routes (Docs, Components, Themes, Github, Discord, Twitter)
77
div(class: "md:hidden") do
8-
main_link("Docs", helpers.docs_introduction_path)
9-
main_link("Components", helpers.docs_accordion_path)
10-
main_link("Themes", helpers.theme_path("default"))
8+
main_link("Docs", docs_introduction_path)
9+
main_link("Components", docs_accordion_path)
10+
main_link("Themes", theme_path("default"))
1111
main_link("Github", "https://github.com/PhlexUI/phlex_ui")
1212
main_link("Discord", ENV["DISCORD_INVITE_LINK"])
1313
main_link("Twitter", ENV["PHLEXUI_TWITTER_LINK"])
@@ -44,70 +44,70 @@ def view_template
4444

4545
def getting_started_links
4646
[
47-
{name: "Introduction", path: helpers.docs_introduction_path},
48-
{name: "Installation", path: helpers.docs_installation_path},
49-
{name: "Dark mode", path: helpers.docs_dark_mode_path},
50-
{name: "Theming", path: helpers.docs_theming_path},
51-
{name: "Customizing components", path: helpers.docs_customizing_components_path}
47+
{name: "Introduction", path: docs_introduction_path},
48+
{name: "Installation", path: docs_installation_path},
49+
{name: "Dark mode", path: docs_dark_mode_path},
50+
{name: "Theming", path: docs_theming_path},
51+
{name: "Customizing components", path: docs_customizing_components_path}
5252
]
5353
end
5454

5555
def installation_links
5656
[
57-
{name: "Rails - JS Bundler", path: helpers.docs_installation_rails_bundler_path},
58-
{name: "Rails - Importmaps", path: helpers.docs_installation_rails_importmaps_path}
57+
{name: "Rails - JS Bundler", path: docs_installation_rails_bundler_path},
58+
{name: "Rails - Importmaps", path: docs_installation_rails_importmaps_path}
5959
]
6060
end
6161

6262
def components
6363
[
64-
{name: "Accordion", path: helpers.docs_accordion_path},
65-
{name: "Alert", path: helpers.docs_alert_path},
66-
{name: "Alert Dialog", path: helpers.docs_alert_dialog_path},
67-
{name: "Aspect Ratio", path: helpers.docs_aspect_ratio_path},
68-
{name: "Avatar", path: helpers.docs_avatar_path},
69-
{name: "Badge", path: helpers.docs_badge_path},
70-
{name: "Breadcrumb", path: helpers.docs_breadcrumb_path, badge: "New"},
71-
{name: "Button", path: helpers.docs_button_path},
72-
{name: "Calendar", path: helpers.docs_calendar_path},
73-
{name: "Card", path: helpers.docs_card_path},
74-
# { name: "Chart", path: helpers.docs_chart_path, badge: "New" },
75-
{name: "Checkbox", path: helpers.docs_checkbox_path},
76-
{name: "Checkbox Group", path: helpers.docs_checkbox_group_path},
77-
{name: "Clipboard", path: helpers.docs_clipboard_path},
78-
{name: "Codeblock", path: helpers.docs_codeblock_path},
79-
{name: "Collapsible", path: helpers.docs_collapsible_path},
80-
{name: "Combobox", path: helpers.docs_combobox_path, badge: "Updated"},
81-
{name: "Command", path: helpers.docs_command_path},
82-
{name: "Context Menu", path: helpers.docs_context_menu_path},
83-
{name: "Date Picker", path: helpers.docs_date_picker_path},
84-
{name: "Dialog / Modal", path: helpers.docs_dialog_path},
85-
{name: "Dropdown Menu", path: helpers.docs_dropdown_menu_path},
86-
{name: "Form", path: helpers.docs_form_path},
87-
{name: "Hover Card", path: helpers.docs_hover_card_path},
88-
{name: "Input", path: helpers.docs_input_path},
89-
{name: "Link", path: helpers.docs_link_path},
90-
{name: "Masked Input", path: helpers.masked_input_path},
91-
{name: "Pagination", path: helpers.docs_pagination_path, badge: "New"},
92-
{name: "Popover", path: helpers.docs_popover_path},
93-
{name: "Progress", path: helpers.docs_progress_path, badge: "New"},
94-
{name: "Radio Button", path: helpers.docs_radio_button_path, badge: "New"},
95-
{name: "Select", path: helpers.docs_select_path, badge: "New"},
96-
{name: "Sheet", path: helpers.docs_sheet_path},
97-
{name: "Shortcut Key", path: helpers.docs_shortcut_key_path},
98-
{name: "Skeleton", path: helpers.docs_skeleton_path, badge: "New"},
99-
{name: "Switch", path: helpers.docs_switch_path},
100-
{name: "Table", path: helpers.docs_table_path},
101-
{name: "Tabs", path: helpers.docs_tabs_path},
102-
{name: "Textarea", path: helpers.docs_textarea_path},
103-
{name: "Theme Toggle", path: helpers.docs_theme_toggle_path},
104-
{name: "Tooltip", path: helpers.docs_tooltip_path},
105-
{name: "Typography", path: helpers.docs_typography_path}
64+
{name: "Accordion", path: docs_accordion_path},
65+
{name: "Alert", path: docs_alert_path},
66+
{name: "Alert Dialog", path: docs_alert_dialog_path},
67+
{name: "Aspect Ratio", path: docs_aspect_ratio_path},
68+
{name: "Avatar", path: docs_avatar_path},
69+
{name: "Badge", path: docs_badge_path},
70+
{name: "Breadcrumb", path: docs_breadcrumb_path, badge: "New"},
71+
{name: "Button", path: docs_button_path},
72+
{name: "Calendar", path: docs_calendar_path},
73+
{name: "Card", path: docs_card_path},
74+
# { name: "Chart", path: docs_chart_path, badge: "New" },
75+
{name: "Checkbox", path: docs_checkbox_path},
76+
{name: "Checkbox Group", path: docs_checkbox_group_path},
77+
{name: "Clipboard", path: docs_clipboard_path},
78+
{name: "Codeblock", path: docs_codeblock_path},
79+
{name: "Collapsible", path: docs_collapsible_path},
80+
{name: "Combobox", path: docs_combobox_path, badge: "Updated"},
81+
{name: "Command", path: docs_command_path},
82+
{name: "Context Menu", path: docs_context_menu_path},
83+
{name: "Date Picker", path: docs_date_picker_path},
84+
{name: "Dialog / Modal", path: docs_dialog_path},
85+
{name: "Dropdown Menu", path: docs_dropdown_menu_path},
86+
{name: "Form", path: docs_form_path},
87+
{name: "Hover Card", path: docs_hover_card_path},
88+
{name: "Input", path: docs_input_path},
89+
{name: "Link", path: docs_link_path},
90+
{name: "Masked Input", path: masked_input_path},
91+
{name: "Pagination", path: docs_pagination_path, badge: "New"},
92+
{name: "Popover", path: docs_popover_path},
93+
{name: "Progress", path: docs_progress_path, badge: "New"},
94+
{name: "Radio Button", path: docs_radio_button_path, badge: "New"},
95+
{name: "Select", path: docs_select_path, badge: "New"},
96+
{name: "Sheet", path: docs_sheet_path},
97+
{name: "Shortcut Key", path: docs_shortcut_key_path},
98+
{name: "Skeleton", path: docs_skeleton_path, badge: "New"},
99+
{name: "Switch", path: docs_switch_path},
100+
{name: "Table", path: docs_table_path},
101+
{name: "Tabs", path: docs_tabs_path},
102+
{name: "Textarea", path: docs_textarea_path},
103+
{name: "Theme Toggle", path: docs_theme_toggle_path},
104+
{name: "Tooltip", path: docs_tooltip_path},
105+
{name: "Typography", path: docs_typography_path}
106106
]
107107
end
108108

109109
def menu_link(component)
110-
current_path = component[:path] == helpers.request.path
110+
current_path = component[:path] == request.path
111111
a(
112112
href: component[:path],
113113
class: [
@@ -123,7 +123,7 @@ def menu_link(component)
123123
end
124124

125125
def main_link(name, path)
126-
current_path = path == helpers.request.path
126+
current_path = path == request.path
127127
a(
128128
href: path,
129129
class: [

‎app/views/components/shared/navbar.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ def view_template
88
render Shared::MobileMenu.new(class: "md:hidden")
99
render Shared::Logo.new
1010

11-
Link(href: helpers.docs_introduction_path, variant: :ghost, class: "hidden md:inline-block") { "Docs" }
12-
Link(href: helpers.docs_accordion_path, variant: :ghost, class: "hidden md:inline-block") { "Components" }
13-
Link(href: helpers.theme_path("default"), variant: :ghost, class: "hidden md:inline-block") { "Themes" }
11+
Link(href: docs_introduction_path, variant: :ghost, class: "hidden md:inline-block") { "Docs" }
12+
Link(href: docs_accordion_path, variant: :ghost, class: "hidden md:inline-block") { "Components" }
13+
Link(href: theme_path("default"), variant: :ghost, class: "hidden md:inline-block") { "Themes" }
1414
end
1515
div(class: "flex items-center gap-x-2 md:divide-x") do
1616
div(class: "flex items-center") do

‎app/views/docs/aspect_ratio_view.rb

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ def view_template
1414
img(
1515
alt: "Placeholder",
1616
loading: "lazy",
17-
src:
18-
helpers.image_path('pattern.jpg')
17+
src: image_path('pattern.jpg')
1918
)
2019
end
2120
RUBY
@@ -27,8 +26,7 @@ def view_template
2726
img(
2827
alt: "Placeholder",
2928
loading: "lazy",
30-
src:
31-
helpers.image_path('pattern.jpg')
29+
src: image_path('pattern.jpg')
3230
)
3331
end
3432
RUBY
@@ -40,8 +38,7 @@ def view_template
4038
img(
4139
alt: "Placeholder",
4240
loading: "lazy",
43-
src:
44-
helpers.image_path('pattern.jpg')
41+
src: image_path('pattern.jpg')
4542
)
4643
end
4744
RUBY
@@ -53,8 +50,7 @@ def view_template
5350
img(
5451
alt: "Placeholder",
5552
loading: "lazy",
56-
src:
57-
helpers.image_path('pattern.jpg')
53+
src: image_path('pattern.jpg')
5854
)
5955
end
6056
RUBY

‎app/views/docs/card_view.rb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ def view_template
2020
img(
2121
alt: "Placeholder",
2222
loading: "lazy",
23-
src:
24-
helpers.image_url('pattern.jpg')
23+
src: image_url('pattern.jpg')
2524
)
2625
end
2726
end
@@ -40,8 +39,7 @@ def view_template
4039
img(
4140
alt: "Placeholder",
4241
loading: "lazy",
43-
src:
44-
helpers.image_url('pattern.jpg')
42+
src: image_url('pattern.jpg')
4543
)
4644
end
4745
CardHeader do

‎app/views/docs/command_view.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,12 @@ def default_icon
135135

136136
def components_list
137137
[
138-
{name: "Accordion", path: helpers.docs_accordion_path},
139-
{name: "Alert", path: helpers.docs_alert_path},
140-
{name: "Alert Dialog", path: helpers.docs_alert_dialog_path},
141-
{name: "Aspect Ratio", path: helpers.docs_aspect_ratio_path},
142-
{name: "Avatar", path: helpers.docs_avatar_path},
143-
{name: "Badge", path: helpers.docs_badge_path}
138+
{name: "Accordion", path: docs_accordion_path},
139+
{name: "Alert", path: docs_alert_path},
140+
{name: "Alert Dialog", path: docs_alert_dialog_path},
141+
{name: "Aspect Ratio", path: docs_aspect_ratio_path},
142+
{name: "Avatar", path: docs_avatar_path},
143+
{name: "Badge", path: docs_badge_path}
144144
]
145145
end
146146

‎app/views/docs/dialog_view.rb

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ def view_template
2525
img(
2626
alt: "Placeholder",
2727
loading: "lazy",
28-
src:
29-
helpers.image_path("pattern.jpg")
28+
src: image_path("pattern.jpg")
3029
)
3130
end
3231
end
@@ -56,8 +55,7 @@ def view_template
5655
img(
5756
alt: "Placeholder",
5857
loading: "lazy",
59-
src:
60-
helpers.image_path("pattern.jpg")
58+
src: image_path("pattern.jpg")
6159
)
6260
end
6361
end
@@ -82,8 +80,7 @@ def view_template
8280
img(
8381
alt: "Placeholder",
8482
loading: "lazy",
85-
src:
86-
helpers.image_path("pattern.jpg")
83+
src: image_path("pattern.jpg")
8784
)
8885
end
8986
end

‎app/views/docs/getting_started/installation_view.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ def view_template
99

1010
Heading(level: 2) { "Select a Framework" }
1111
div(class: "grid grid-cols-1 sm:grid-cols-2 gap-4") do
12-
framework_card(title: "Rails --- JS Bundler", link: helpers.docs_installation_rails_bundler_path) { rails_logo }
13-
framework_card(title: "Rails --- Importmaps", link: helpers.docs_installation_rails_importmaps_path) { rails_logo }
12+
framework_card(title: "Rails --- JS Bundler", link: docs_installation_rails_bundler_path) { rails_logo }
13+
framework_card(title: "Rails --- Importmaps", link: docs_installation_rails_importmaps_path) { rails_logo }
1414
end
1515
end
1616
end

‎app/views/docs/typography_view.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def view_template
4343
<<~RUBY
4444
Text(class: 'text-center') do
4545
plain "Checkout our "
46-
InlineLink(href: helpers.docs_installation_path) { "installation instructions" }
46+
InlineLink(href: docs_installation_path) { "installation instructions" }
4747
plain " to get started."
4848
end
4949
RUBY

0 commit comments

Comments
 (0)