phcdevworks_members 11.2.0 → 12.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (95) hide show
  1. checksums.yaml +4 -4
  2. data/MIT-LICENSE +20 -20
  3. data/README.md +2 -1
  4. data/Rakefile +8 -8
  5. data/app/assets/config/phcdevworks_members_manifest.js +2 -3
  6. data/app/controllers/phcdevworks_members/api/v1/categories_controller.rb +0 -0
  7. data/app/controllers/phcdevworks_members/api/v1/listings_controller.rb +0 -0
  8. data/app/controllers/phcdevworks_members/application_controller.rb +0 -0
  9. data/app/controllers/phcdevworks_members/directory/categories_controller.rb +0 -0
  10. data/app/controllers/phcdevworks_members/member/addresses_controller.rb +0 -0
  11. data/app/controllers/phcdevworks_members/member/dashboard_controller.rb +0 -0
  12. data/app/controllers/phcdevworks_members/member/listings_controller.rb +0 -0
  13. data/app/controllers/phcdevworks_members/member/profiles_controller.rb +0 -0
  14. data/app/helpers/phcdevworks_members/application_helper.rb +0 -0
  15. data/app/helpers/phcdevworks_members/directory/categories_helper.rb +0 -0
  16. data/app/helpers/phcdevworks_members/member/addresses_helper.rb +0 -0
  17. data/app/helpers/phcdevworks_members/member/dashboard_helper.rb +0 -0
  18. data/app/helpers/phcdevworks_members/member/listings_helper.rb +0 -0
  19. data/app/helpers/phcdevworks_members/member/profiles_helper.rb +0 -0
  20. data/app/jobs/phcdevworks_members/application_job.rb +0 -0
  21. data/app/mailers/phcdevworks_members/application_mailer.rb +0 -0
  22. data/app/models/phcdevworks_members/application_record.rb +0 -0
  23. data/app/models/phcdevworks_members/directory/category.rb +0 -0
  24. data/app/models/phcdevworks_members/directory.rb +0 -0
  25. data/app/models/phcdevworks_members/directory_category_versions.rb +0 -0
  26. data/app/models/phcdevworks_members/member/address.rb +0 -0
  27. data/app/models/phcdevworks_members/member/listing.rb +0 -0
  28. data/app/models/phcdevworks_members/member/profile.rb +0 -0
  29. data/app/models/phcdevworks_members/member.rb +0 -0
  30. data/app/models/phcdevworks_members/member_address_versions.rb +0 -0
  31. data/app/models/phcdevworks_members/member_listing_versions.rb +0 -0
  32. data/app/models/phcdevworks_members/member_profile_versions.rb +0 -0
  33. data/app/views/layouts/phcdevworks_members/application.html.erb +73 -66
  34. data/app/views/layouts/phcdevworks_members/components/backend/footer/_footer.html.erb +10 -9
  35. data/app/views/layouts/phcdevworks_members/components/backend/navigation/_top_menu.html.erb +26 -25
  36. data/app/views/layouts/phcdevworks_members/components/backend/sidebars/_side_menu.html.erb +491 -349
  37. data/app/views/layouts/phcdevworks_members/member_profile.html.erb +58 -50
  38. data/app/views/phcdevworks_members/api/v1/categories/index.json.rabl +0 -0
  39. data/app/views/phcdevworks_members/api/v1/listings/index.json.rabl +0 -0
  40. data/app/views/phcdevworks_members/directory/categories/_form.html.erb +10 -10
  41. data/app/views/phcdevworks_members/directory/categories/components/_category_audits.html.erb +0 -0
  42. data/app/views/phcdevworks_members/directory/categories/components/_category_list.html.erb +0 -0
  43. data/app/views/phcdevworks_members/directory/categories/components/_category_main.html.erb +4 -4
  44. data/app/views/phcdevworks_members/directory/categories/components/_category_sidebar.html.erb +0 -0
  45. data/app/views/phcdevworks_members/directory/categories/edit.html.erb +23 -31
  46. data/app/views/phcdevworks_members/directory/categories/index.html.erb +44 -52
  47. data/app/views/phcdevworks_members/directory/categories/new.html.erb +23 -31
  48. data/app/views/phcdevworks_members/directory/categories/show.html.erb +9 -9
  49. data/app/views/phcdevworks_members/member/addresses/_form.html.erb +22 -22
  50. data/app/views/phcdevworks_members/member/addresses/components/_address_audits_table.html.erb +0 -0
  51. data/app/views/phcdevworks_members/member/addresses/components/_address_main.html.erb +0 -0
  52. data/app/views/phcdevworks_members/member/addresses/edit.html.erb +23 -31
  53. data/app/views/phcdevworks_members/member/addresses/index.html.erb +60 -68
  54. data/app/views/phcdevworks_members/member/addresses/new.html.erb +23 -31
  55. data/app/views/phcdevworks_members/member/addresses/show.html.erb +17 -17
  56. data/app/views/phcdevworks_members/member/dashboard/index.html.erb +0 -0
  57. data/app/views/phcdevworks_members/member/listings/_form.html.erb +31 -31
  58. data/app/views/phcdevworks_members/member/listings/components/_listing_audits_table.html.erb +0 -0
  59. data/app/views/phcdevworks_members/member/listings/components/_listing_main.html.erb +0 -0
  60. data/app/views/phcdevworks_members/member/listings/edit.html.erb +23 -31
  61. data/app/views/phcdevworks_members/member/listings/index.html.erb +62 -70
  62. data/app/views/phcdevworks_members/member/listings/new.html.erb +23 -31
  63. data/app/views/phcdevworks_members/member/listings/show.html.erb +17 -17
  64. data/app/views/phcdevworks_members/member/profiles/_form.html.erb +20 -20
  65. data/app/views/phcdevworks_members/member/profiles/components/_profile_addresses_table.html.erb +0 -0
  66. data/app/views/phcdevworks_members/member/profiles/components/_profile_audits_table.html.erb +0 -0
  67. data/app/views/phcdevworks_members/member/profiles/components/_profile_header.html.erb +10 -10
  68. data/app/views/phcdevworks_members/member/profiles/components/_profile_information_table.html.erb +0 -0
  69. data/app/views/phcdevworks_members/member/profiles/components/_profile_listings_table.html.erb +0 -0
  70. data/app/views/phcdevworks_members/member/profiles/edit.html.erb +23 -31
  71. data/app/views/phcdevworks_members/member/profiles/index.html.erb +58 -66
  72. data/app/views/phcdevworks_members/member/profiles/new.html.erb +23 -31
  73. data/app/views/phcdevworks_members/member/profiles/show.html.erb +22 -22
  74. data/config/routes.rb +0 -4
  75. data/config/spring.rb +0 -0
  76. data/db/migrate/20170517064030_create_phcdevworks_members_member_profile_versions.rb +1 -1
  77. data/db/migrate/20170517064049_create_phcdevworks_members_member_listing_versions.rb +1 -1
  78. data/db/migrate/20170517064114_create_phcdevworks_members_member_address_versions.rb +1 -1
  79. data/db/migrate/20170517064427_create_phcdevworks_members_directory_category_versions.rb +1 -1
  80. data/db/migrate/20190728233154_create_phcdevworks_members_member_addresses.rb +1 -1
  81. data/db/migrate/20190729233450_create_phcdevworks_members_member_listings.rb +1 -1
  82. data/db/migrate/20190729235705_create_phcdevworks_members_member_profiles.rb +1 -1
  83. data/db/migrate/20190730101344_create_phcdevworks_members_directory_categories.rb +1 -1
  84. data/db/migrate/20191024232111_create_phcdevworks_members_categories_listings.rb +1 -1
  85. data/lib/phcdevworks_members/engine.rb +47 -47
  86. data/lib/phcdevworks_members/version.rb +1 -1
  87. data/lib/phcdevworks_members.rb +6 -6
  88. data/lib/tasks/phcdevworks_members_tasks.rake +4 -4
  89. metadata +28 -77
  90. data/app/assets/stylesheets/phcdevworks_members/application.scss +0 -0
  91. data/app/assets/stylesheets/phcdevworks_members/directory/categories.scss +0 -0
  92. data/app/assets/stylesheets/phcdevworks_members/member/addresses.scss +0 -0
  93. data/app/assets/stylesheets/phcdevworks_members/member/dashboard.scss +0 -0
  94. data/app/assets/stylesheets/phcdevworks_members/member/listings.scss +0 -0
  95. data/app/assets/stylesheets/phcdevworks_members/member/profiles.scss +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 49148ed160b265a09e588c238249ab8e8860da699da3bd86e509e6117f7f90d7
4
- data.tar.gz: 52d9dcbc1019a40455cedef80531caf160dec613f148bdb58aea49cd24c8bf16
3
+ metadata.gz: 3f570b4448e33ba4a16040bd6addc81dc5fea1fe5ed904ce7c979891c1bbaab3
4
+ data.tar.gz: 92b498e215cde3d2c86b4bda4b0b875bd8e61b1809d67ce108eb6cb2b7b9a4f3
5
5
  SHA512:
6
- metadata.gz: f61fe90fe9ee19a7b7192aa1cef271061e4217b766ff6b4c5262b8c8589b4d239d27e8e015aa563f5285b122f556d381d089d00373e5dadfb6ffba229ab2913f
7
- data.tar.gz: 7e56f3639c2311040ca5013068574d03f96d3c7a5a90f912085f9b731d81918886070c77492f802e80acda7120a7b5a01e597e08cba735b33728a6810b9e1bbb
6
+ metadata.gz: a84023e316911fed00f823a5388e36f46bd6d76a953aeb4390515ceabd9f4891b29e343a99b68d190b33de98ea6aaa7ea9f3c0b3b4625e127d66981e41dba76e
7
+ data.tar.gz: f853b3486edf081bffc1ab54e92e54d086ce9809a17227fe109489ace105150df6ecda9b2dcb0a2e618f94b286f8b0497805ac910c266d79326bd9ee56f3b5e5
data/MIT-LICENSE CHANGED
@@ -1,20 +1,20 @@
1
- Copyright 2020 BradPotts
2
-
3
- Permission is hereby granted, free of charge, to any person obtaining
4
- a copy of this software and associated documentation files (the
5
- "Software"), to deal in the Software without restriction, including
6
- without limitation the rights to use, copy, modify, merge, publish,
7
- distribute, sublicense, and/or sell copies of the Software, and to
8
- permit persons to whom the Software is furnished to do so, subject to
9
- the following conditions:
10
-
11
- The above copyright notice and this permission notice shall be
12
- included in all copies or substantial portions of the Software.
13
-
14
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
15
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
17
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
18
- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
19
- OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
20
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1
+ Copyright 2022 PHCDevworks
2
+
3
+ Permission is hereby granted, free of charge, to any person obtaining
4
+ a copy of this software and associated documentation files (the
5
+ "Software"), to deal in the Software without restriction, including
6
+ without limitation the rights to use, copy, modify, merge, publish,
7
+ distribute, sublicense, and/or sell copies of the Software, and to
8
+ permit persons to whom the Software is furnished to do so, subject to
9
+ the following conditions:
10
+
11
+ The above copyright notice and this permission notice shall be
12
+ included in all copies or substantial portions of the Software.
13
+
14
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
15
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
17
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
18
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
19
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
20
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
data/README.md CHANGED
@@ -1,4 +1,5 @@
1
- ### PHCDevworks-Members (Membership & Directory Engine) Documentation
1
+ ### PHCDevworks-Members (Membership & Directory Engine) Documentation [![Gem Version](https://badge.fury.io/rb/phcdevworks_members.svg)](https://badge.fury.io/rb/phcdevworks_members)
2
+
2
3
  PHCDevworks-Members rails engine to manage membership information and directory listings.
3
4
 
4
5
  * Fast setup of membership and web directory modules.
data/Rakefile CHANGED
@@ -1,8 +1,8 @@
1
- require "bundler/setup"
2
-
3
- APP_RAKEFILE = File.expand_path("spec/test_app/Rakefile", __dir__)
4
- load "rails/tasks/engine.rake"
5
-
6
- load "rails/tasks/statistics.rake"
7
-
8
- require "bundler/gem_tasks"
1
+ require "bundler/setup"
2
+
3
+ APP_RAKEFILE = File.expand_path("spec/test_app/Rakefile", __dir__)
4
+ load "rails/tasks/engine.rake"
5
+
6
+ load "rails/tasks/statistics.rake"
7
+
8
+ require "bundler/gem_tasks"
@@ -1,3 +1,2 @@
1
- //= link_directory ../stylesheets/phcdevworks_members .scss
2
- //= link phcthemes_admin_panel_pack_coloradmin.css
3
- //= link phcthemes_admin_panel_pack_coloradmin.js
1
+ //= link coloradmin/default/phcthemes_admin_panel_pack_coloradmin.css
2
+ //= link coloradmin/phcthemes_admin_panel_pack_coloradmin.js
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
@@ -1,66 +1,73 @@
1
- <!DOCTYPE html>
2
- <html>
3
- <head>
4
-
5
- <!-- SEO System -->
6
- <% phc_seo_title "PHCDevworks Members" %>
7
- <% phc_seo_description "Ruby on Rails 6 Engine to Organize Members and Manage an Online Members Directory & Listings." %>
8
- <!-- SEO System -->
9
-
10
- <!-- SEO and Site Description -->
11
- <meta charset="utf-8">
12
- <title><%= yield(:phc_seo_title) %></title>
13
- <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
14
- <meta name="description" content="<%= yield(:phc_seo_description) %>">
15
- <!-- SEO and Site Description -->
16
-
17
- <!-- Rails Security Tags -->
18
- <%= csrf_meta_tags %>
19
- <%= csp_meta_tag %>
20
- <!-- Rails Security Tags -->
21
-
22
- <!-- CSS Styles -->
23
- <%= stylesheet_link_tag "phcthemes_admin_panel_pack_coloradmin", media: "all" %>
24
- <!-- CSS Styles -->
25
-
26
- <!-- JavaScript -->
27
- <%= javascript_include_tag "phcthemes_admin_panel_pack_coloradmin" %>
28
- <!-- JavaScript -->
29
-
30
- </head>
31
- <body>
32
-
33
- <!-- Page Container -->
34
- <div id="page-container" class="fade page-sidebar-fixed page-header-fixed">
35
-
36
- <!-- Page Header -->
37
- <div id="header" class="header navbar-default">
38
- <%= render "layouts/phcdevworks_members/components/backend/navigation/top_menu" %>
39
- </div>
40
- <!-- Page Header -->
41
-
42
- <!-- Page Sidebar -->
43
- <div id="sidebar" class="sidebar">
44
- <%= render "layouts/phcdevworks_members/components/backend/sidebars/side_menu" %>
45
- </div>
46
- <div class="sidebar-bg"></div>
47
- <!-- Page Sidebar -->
48
-
49
- <!-- Page Content -->
50
- <div id="content" class="content">
51
- <%= render "phcdevworks_notifications/bootstrap/notifications" %>
52
- <%= yield %>
53
- </div>
54
- <!-- Page Content -->
55
-
56
- <!-- Footer Content -->
57
- <div id="footer" class="footer mb-4">
58
- <%= render "layouts/phcdevworks_members/components/backend/footer/footer" %>
59
- </div>
60
- <!-- Footer Content -->
61
-
62
- </div>
63
- <!-- Page Container -->
64
-
65
- </body>
66
- </html>
1
+ <!DOCTYPE html>
2
+ <html>
3
+ <head>
4
+
5
+ <!-- SEO System -->
6
+ <% phc_seo_title "PHCDevworks Members" %>
7
+ <% phc_seo_description "Ruby on Rails 7 Engine to Organize Members and Manage an Online Members Directory & Listings." %>
8
+ <!-- SEO System -->
9
+
10
+ <!-- SEO and Site Description -->
11
+ <meta charset="utf-8">
12
+ <title><%= yield(:phc_seo_title) %></title>
13
+ <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" name="viewport" />
14
+ <meta name="description" content="<%= yield(:phc_seo_description) %>">
15
+ <!-- SEO and Site Description -->
16
+
17
+ <!-- Rails Security Tags -->
18
+ <%= csrf_meta_tags %>
19
+ <%= csp_meta_tag %>
20
+ <!-- Rails Security Tags -->
21
+
22
+ <!-- CSS Styles -->
23
+ <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" />
24
+ <%= stylesheet_link_tag "coloradmin/default/phcthemes_admin_panel_pack_coloradmin", media: "all" %>
25
+ <!-- CSS Styles -->
26
+
27
+ </head>
28
+ <body>
29
+
30
+ <!-- -PHCDEV- Page Container -->
31
+ <div id="app" class="app app-header-fixed app-sidebar-fixed app-with-wide-sidebar">
32
+
33
+ <!-- -PHCDEV- Page Container - Header -->
34
+ <div id="header" class="app-header">
35
+ <%= render "layouts/phcdevworks_members/components/backend/navigation/top_menu" %>
36
+ </div>
37
+ <!-- -PHCDEV- Page Container - Header -->
38
+
39
+ <!-- -PHCDEV- Page Container - Sidebar -->
40
+ <div id="sidebar" class="app-sidebar" data-disable-slide-animation="true">
41
+ <%= render "layouts/phcdevworks_members/components/backend/sidebars/side_menu" %>
42
+ </div>
43
+ <div class="app-sidebar-bg"></div>
44
+ <div class="app-sidebar-mobile-backdrop"><a href="#" data-dismiss="app-sidebar-mobile" class="stretched-link"></a></div>
45
+ <!-- -PHCDEV- Page Container - Sidebar -->
46
+
47
+ <!-- -PHCDEV- Page Container - Content -->
48
+ <div id="app" class="app app-content-full-height">
49
+ <div id="content" class="app-content d-flex flex-column p-0">
50
+ <!-- -PHCDEV- Page Container - Main -->
51
+ <div class="app-content-padding flex-grow-1 overflow-hidden" data-scrollbar="true" data-height="100%">
52
+ <%= render "phcdevworks_notifications/bootstrap/notifications" %>
53
+ <%= yield %>
54
+ </div>
55
+ <!-- -PHCDEV- Page Container - Main -->
56
+ <!-- -PHCDEV- Page Container - Footer -->
57
+ <div id="footer" class="app-footer m-0">
58
+ <%= render "layouts/phcdevworks_members/components/backend/footer/footer" %>
59
+ </div>
60
+ <!-- -PHCDEV- Page Container - Footer -->
61
+ </div>
62
+ </div>
63
+ <!-- -PHCDEV- Page Container - Content -->
64
+
65
+ </div>
66
+ <!-- -PHCDEV- Page Container -->
67
+
68
+ <!-- JavaScript -->
69
+ <%= javascript_include_tag "coloradmin/phcthemes_admin_panel_pack_coloradmin" %>
70
+ <!-- JavaScript -->
71
+
72
+ </body>
73
+ </html>
@@ -1,16 +1,17 @@
1
- <!-- Footer Content - Left -->
1
+ <!-- -PHCDEV- Page Container - Footer - Left -->
2
2
  <span>
3
- <!-- Footer Content - Left - Time in Production -->
3
+ <!-- -PHCDEV- Page Container - Footer - Left - Copyright -->
4
4
  <i class="fab fa-osi font-weight-bolder"></i> 2012-<%= Time.now.year %> -
5
- <span class="font-weight-bold">PHC</span>Devworks Members -
6
- Engine v<%= Gem.loaded_specs["phcdevworks_members"].version.to_s %>
7
- <!-- Footer Content - Left - Time in Production -->
5
+ <span class="phc_dev_strong_plugin">PHC</span><span class="phc_dev_light_plugin">Devworks</span> Members - Engine v<%= Gem.loaded_specs["phcdevworks_members"].version.to_s %>
6
+ <!-- -PHCDEV- Page Container - Footer - Left - Copyright -->
8
7
  </span>
9
- <!-- Footer Content - Left -->
8
+ <!-- -PHCDEV- Page Container - Footer - Left -->
10
9
 
11
- <!-- Footer Content - Right -->
10
+ <!-- -PHCDEV- Page Container - Footer - Right -->
12
11
  <span class="float-right">
12
+ <!-- -PHCDEV- Page Container - Footer - Right - Developed -->
13
13
  Developed with <i class="fas fa-heart hanna_hearts"></i> by
14
- <a class="phcnet_copyright text-dark" href="https://phcdevworks.com/"><u><span class="font-weight-bold">PHC</span>Devworks</u></a>
14
+ <a class="phcnet_copyright text-dark" href="https://phcdevworks.com/"><u><span class="phc_dev_strong_plugin">PHC</span><span class="phc_dev_light_plugin">Devworks</span></u></a>
15
+ <!-- -PHCDEV- Page Container - Footer - Right - Developed -->
15
16
  </span>
16
- <!-- Footer Content - Right -->
17
+ <!-- -PHCDEV- Page Container - Footer - Right -->
@@ -1,40 +1,41 @@
1
- <!-- -PHC- Topbar - Navigation Header -->
1
+ <!-- -PHCDEV- Topbar - Navigation Header -->
2
2
  <div class="navbar-header">
3
3
 
4
- <%= link_to phcdevworks_members.member_profiles_path, class: "navbar-brand" do %>
5
- <strong>PHCDevworks</strong>Members
6
- <% end %>
7
-
8
- <button type="button" class="navbar-toggle" data-click="sidebar-toggled">
9
- <span class="icon-bar"></span>
10
- <span class="icon-bar"></span>
11
- <span class="icon-bar"></span>
4
+ <button type="button" class="navbar-mobile-toggler" data-toggle="app-sidebar-mobile">
5
+ <span class="icon-bar"></span>
6
+ <span class="icon-bar"></span>
7
+ <span class="icon-bar"></span>
12
8
  </button>
13
9
 
10
+ <%= link_to phcdevworks_accounts_devise.user_path, class: "navbar-brand" do %>
11
+ <span class="phc_dev_strong_plugin_logo">PHC</span><span class="phc_dev_light_plugin_logo">Devworks</span>
12
+ <% end %>
13
+
14
14
  </div>
15
- <!-- -PHC- Topbar - Navigation Header -->
15
+ <!-- -PHCDEV- Topbar - Navigation Header -->
16
16
 
17
- <!-- -PHC- Topbar - Navigation Main -->
17
+ <!-- -PHCDEV- Topbar - Navigation Main -->
18
18
  <% if current_user %>
19
- <ul class="navbar-nav navbar-right">
20
-
21
- <!-- -PHC- Topbar - Navigation Main - User Menu -->
22
- <li class="dropdown navbar-user">
23
- <a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown">
19
+ <div class="navbar-nav">
20
+ <div class="navbar-item navbar-user dropdown">
21
+ <a href="#" class="navbar-link dropdown-toggle d-flex align-items-center" data-bs-toggle="dropdown">
24
22
  <%= image_tag current_user.gravatar_url %>
25
- <span class="d-none d-md-inline"><%= current_user.firstname + " " + current_user.lastname %></span> <b class="caret"></b>
23
+ <span>
24
+ <span class="d-none d-md-inline"><%= current_user.firstname + " " + current_user.lastname %></span>
25
+ <b class="caret"></b>
26
+ </span>
26
27
  </a>
27
- <div class="dropdown-menu dropdown-menu-right">
28
- <%= link_to phcdevworks_accounts.edit_user_registration_path, class: "dropdown-item" do %>
28
+ <div class="dropdown-menu dropdown-menu-end me-1">
29
+ <%= link_to phcdevworks_accounts_devise.edit_user_registration_path, class: "dropdown-item" do %>
29
30
  <i class="fad fa-cogs"></i> Account Settings
30
31
  <% end %>
31
- <%= link_to phcdevworks_accounts.destroy_user_session_path, method: :delete, class: "dropdown-item" do %>
32
+ <%= link_to phcdevworks_accounts_devise.destroy_user_session_path, method: :delete, class: "dropdown-item" do %>
32
33
  <i class="fad fa-sign-out-alt"></i> Logout
33
34
  <% end %>
34
35
  </div>
35
- </li>
36
- <!-- -PHC- Topbar - Navigation Main - User Menu -->
37
-
38
- </ul>
36
+ </div>
37
+ </div>
39
38
  <% end %>
40
- <!-- -PHC- Topbar - Navigation Main -->
39
+
40
+ </div>
41
+ <!-- -PHCDEV- Topbar - Navigation Main -->