phcdevworks_accounts_stripe 0.2.0 → 1.0.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (53) hide show
  1. checksums.yaml +4 -4
  2. data/MIT-LICENSE +20 -20
  3. data/README.md +46 -1
  4. data/Rakefile +8 -8
  5. data/app/assets/config/phcdevworks_accounts_stripe_manifest.js +2 -3
  6. data/app/assets/stylesheets/phcdevworks_accounts_stripe/application.css +15 -15
  7. data/app/controllers/phcdevworks_accounts_stripe/admin/customers_controller.rb +0 -0
  8. data/app/controllers/phcdevworks_accounts_stripe/admin/invoices_controller.rb +0 -0
  9. data/app/controllers/phcdevworks_accounts_stripe/admin/products_controller.rb +0 -0
  10. data/app/controllers/phcdevworks_accounts_stripe/admin/subscriptions_controller.rb +0 -0
  11. data/app/controllers/phcdevworks_accounts_stripe/application_controller.rb +0 -0
  12. data/app/controllers/phcdevworks_accounts_stripe/user/invoices_controller.rb +0 -0
  13. data/app/controllers/phcdevworks_accounts_stripe/user/product_controller.rb +0 -0
  14. data/app/controllers/phcdevworks_accounts_stripe/user/subscription_controller.rb +0 -0
  15. data/app/helpers/phcdevworks_accounts_stripe/admin/customers_helper.rb +0 -0
  16. data/app/helpers/phcdevworks_accounts_stripe/admin/invoices_helper.rb +0 -0
  17. data/app/helpers/phcdevworks_accounts_stripe/admin/plans_helper.rb +0 -0
  18. data/app/helpers/phcdevworks_accounts_stripe/admin/subscriptions_helper.rb +0 -0
  19. data/app/helpers/phcdevworks_accounts_stripe/application_helper.rb +0 -0
  20. data/app/helpers/phcdevworks_accounts_stripe/user/invoices_helper.rb +0 -0
  21. data/app/helpers/phcdevworks_accounts_stripe/user/plan_helper.rb +0 -0
  22. data/app/helpers/phcdevworks_accounts_stripe/user/subscription_helper.rb +0 -0
  23. data/app/jobs/phcdevworks_accounts_stripe/application_job.rb +4 -4
  24. data/app/mailers/phcdevworks_accounts_stripe/application_mailer.rb +6 -6
  25. data/app/models/phcdevworks_accounts_stripe/application_record.rb +0 -0
  26. data/app/views/layouts/phcdevworks_accounts_stripe/application.html.erb +36 -29
  27. data/app/views/layouts/phcdevworks_accounts_stripe/components/backend/footer/_footer.html.erb +10 -8
  28. data/app/views/layouts/phcdevworks_accounts_stripe/components/backend/navigation/_top_menu.html.erb +26 -25
  29. data/app/views/layouts/phcdevworks_accounts_stripe/components/backend/sidebars/_side_menu.html.erb +491 -349
  30. data/app/views/phcdevworks_accounts_stripe/admin/customers/admin_customer_list.html.erb +44 -52
  31. data/app/views/phcdevworks_accounts_stripe/admin/invoices/admin_invoice_list.html.erb +61 -69
  32. data/app/views/phcdevworks_accounts_stripe/admin/products/admin_products_list.html.erb +46 -54
  33. data/app/views/phcdevworks_accounts_stripe/admin/subscriptions/admin_subscription_list.html.erb +48 -56
  34. data/app/views/phcdevworks_accounts_stripe/user/invoices/user_invoice_item.html.erb +0 -0
  35. data/app/views/phcdevworks_accounts_stripe/user/invoices/user_invoice_list.html.erb +0 -0
  36. data/app/views/phcdevworks_accounts_stripe/user/products/user_product_list.html.erb +0 -0
  37. data/app/views/phcdevworks_accounts_stripe/user/subscription/user_subscription_cancel.html.erb +0 -0
  38. data/app/views/phcdevworks_accounts_stripe/user/subscription/user_subscription_item.html.erb +0 -0
  39. data/config/initializers/stripe.rb +0 -0
  40. data/config/routes.rb +14 -17
  41. data/lib/phcdevworks_accounts_stripe/engine.rb +44 -47
  42. data/lib/phcdevworks_accounts_stripe/version.rb +3 -3
  43. data/lib/phcdevworks_accounts_stripe.rb +6 -6
  44. data/lib/tasks/phcdevworks_accounts_stripe_tasks.rake +4 -4
  45. metadata +41 -50
  46. data/app/assets/javascripts/phcdevworks_accounts_stripe/admin/invoices.coffee +0 -3
  47. data/app/assets/stylesheets/phcdevworks_accounts_stripe/admin/customers.css +0 -4
  48. data/app/assets/stylesheets/phcdevworks_accounts_stripe/admin/invoices.scss +0 -3
  49. data/app/assets/stylesheets/phcdevworks_accounts_stripe/admin/plans.css +0 -4
  50. data/app/assets/stylesheets/phcdevworks_accounts_stripe/admin/subscriptions.css +0 -4
  51. data/app/assets/stylesheets/phcdevworks_accounts_stripe/user/invoices.css +0 -4
  52. data/app/assets/stylesheets/phcdevworks_accounts_stripe/user/plan.css +0 -4
  53. data/app/assets/stylesheets/phcdevworks_accounts_stripe/user/subscription.css +0 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 3a346b3414cfeb2c87c47e4f6f8b436d485db7d230a6c6ef90219e346988618f
4
- data.tar.gz: 8db8dd176e1d4c9cbc253a690c5ad8e7466897170f632a0056b90199e31cdcc0
3
+ metadata.gz: 43769b011ac594773b4ec664aaca48c131170e74832a5cd55bbb7431a68dd15e
4
+ data.tar.gz: 56a7128fcb6e67d00fa437ec87d095d6e702824b35d849ec4d076c4185790324
5
5
  SHA512:
6
- metadata.gz: b5c2902f220303e0f785d1ad43ca10a9093b153f4325f5b78bf9664b1003a95589b562388cb15d960bdfecb7a206f60add2f8a7b97d9eb64273c5570ac54f633
7
- data.tar.gz: 30d0d8a4e4c27fe37683fea8b9d9fb3b55f1722e96cd9e9b6ce3df8764e97dd9f0bc97dfa4b1ce27b94194a5cb574f1de6be7f68e2d28572978b59a0e4bb59c7
6
+ metadata.gz: 2bf0ae876a7c6f4c4de9567237c1dfe452e705c44e0be79706164c92e28244b7eb042c8c0322cee252e43591bacc1c14e22dbb297bb077b3d5d7ca1598800ff8
7
+ data.tar.gz: 4288b846bc83e3f920ac1c105d76c809a852a5cf60bd883ebe7af8143a1a760ff4df0ae683c5b2796079f570b0f6bd319458b7c48ff8c01686f334196cc1333b
data/MIT-LICENSE CHANGED
@@ -1,20 +1,20 @@
1
- Copyright 2021 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 +1,46 @@
1
- [![Gem Version](https://badge.fury.io/rb/phcdevworks_accounts_stripe.svg)](https://badge.fury.io/rb/phcdevworks_accounts_stripe)
1
+ ### PHCDevworks Accounts Stripe Addon
2
+
3
+ Rails Stripe Management System add-on for PHCDevworks Accounts engines.
4
+
5
+ ### Administrative Views
6
+ * View invoices
7
+ * View subscribers
8
+ * View customers
9
+
10
+ #### Step 1 - Add PHCDevworks Accounts Devise & PHCDevworks Accounts Stripe to your gemfile run command
11
+
12
+ gem 'phcdevworks_accounts_devise'
13
+ gem 'phcdevworks_accounts_stripe'
14
+ bundle install
15
+
16
+ #### Step 2 - Copy Phcdevworks Account's Database Tables
17
+ To copy requried database migrations, copy each command individually to your terminal's command line.
18
+
19
+ rails phcdevworks_accounts_devise:install:migrations
20
+ rails db:migrate
21
+
22
+ #### Step 3 - Mount Phcdevworks Account Devise & PHCDevworks Account Stripe to Add Routes
23
+ Mount Phcdevworks Press by adding code below to your routes file.
24
+
25
+ mount PhcdevworksAccountsDevise::Engine, :at => '/'
26
+ mount PhcdevworksAccountsStripe::Engine => "/"
27
+
28
+ #### Step 4 - Recompile Assets
29
+ To properly function re-compile your application's assets to copy over required files.
30
+
31
+ rails assets:clobber
32
+ rails assets:precompile
33
+
34
+ #### Step 5 - Add ENV Variables
35
+
36
+ Secret Key = ENV['PHCDEV_STRIPE_SK']
37
+ Publishable Key = ENV['PHCDEV_STRIPE_PK']
38
+
39
+ #### Customizations - Generate Contact Form View (Customization)
40
+ All Phcdevworks Stripe views and layouts can be overwritten by copying files to your application.
41
+
42
+ rails generate phcdevworks_accounts_stripe:views
43
+
44
+ ### Status
45
+
46
+ [![Gem Version](https://badge.fury.io/rb/phcdevworks_accounts_stripe.svg)](https://badge.fury.io/rb/phcdevworks_accounts_stripe) [![Publish to Github.com](https://github.com/phcdevworks/phcdevworks_accounts_stripe/actions/workflows/publish_gem_github_com.yml/badge.svg)](https://github.com/phcdevworks/phcdevworks_accounts_stripe/actions/workflows/publish_gem_github_com.yml) [![Publish to Rubygems.org](https://github.com/phcdevworks/phcdevworks_accounts_stripe/actions/workflows/publish_gem_rubygems_org.yml/badge.svg)](https://github.com/phcdevworks/phcdevworks_accounts_stripe/actions/workflows/publish_gem_rubygems_org.yml)
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_accounts_stripe .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
@@ -1,15 +1,15 @@
1
- /*
2
- * This is a manifest file that'll be compiled into application.css, which will include all the files
3
- * listed below.
4
- *
5
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
6
- * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
7
- *
8
- * You're free to add application-wide styles to this file and they'll appear at the bottom of the
9
- * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
10
- * files in this directory. Styles in this file should be added after the last require_* statement.
11
- * It is generally better to create a new file per style scope.
12
- *
13
- *= require_tree .
14
- *= require_self
15
- */
1
+ /*
2
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
3
+ * listed below.
4
+ *
5
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
6
+ * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
7
+ *
8
+ * You're free to add application-wide styles to this file and they'll appear at the bottom of the
9
+ * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
10
+ * files in this directory. Styles in this file should be added after the last require_* statement.
11
+ * It is generally better to create a new file per style scope.
12
+ *
13
+ *= require_tree .
14
+ *= require_self
15
+ */
@@ -1,4 +1,4 @@
1
- module PhcdevworksAccountsStripe
2
- class ApplicationJob < ActiveJob::Base
3
- end
4
- end
1
+ module PhcdevworksAccountsStripe
2
+ class ApplicationJob < ActiveJob::Base
3
+ end
4
+ end
@@ -1,6 +1,6 @@
1
- module PhcdevworksAccountsStripe
2
- class ApplicationMailer < ActionMailer::Base
3
- default from: 'from@example.com'
4
- layout 'mailer'
5
- end
6
- end
1
+ module PhcdevworksAccountsStripe
2
+ class ApplicationMailer < ActionMailer::Base
3
+ default from: "from@example.com"
4
+ layout "mailer"
5
+ end
6
+ end
@@ -3,14 +3,14 @@
3
3
  <head>
4
4
 
5
5
  <!-- SEO System -->
6
- <% phc_seo_title "PHCDevworks Accounts" %>
7
- <% phc_seo_description "Ruby on Rails 6 Authentication and User Management Engine." %>
6
+ <% phc_seo_title "PHCDevworks Accounts Stripe" %>
7
+ <% phc_seo_description "Ruby on Rails 7 Stripe Addon for PHCDevworks Accounts plugin." %>
8
8
  <!-- SEO System -->
9
9
 
10
10
  <!-- SEO and Site Description -->
11
11
  <meta charset="utf-8">
12
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">
13
+ <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" name="viewport" />
14
14
  <meta name="description" content="<%= yield(:phc_seo_description) %>">
15
15
  <!-- SEO and Site Description -->
16
16
 
@@ -20,47 +20,54 @@
20
20
  <!-- Rails Security Tags -->
21
21
 
22
22
  <!-- CSS Styles -->
23
- <%= stylesheet_link_tag "phcthemes_admin_panel_pack_coloradmin", media: "all" %>
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" %>
24
25
  <!-- CSS Styles -->
25
26
 
26
- <!-- JavaScript -->
27
- <%= javascript_include_tag "phcthemes_admin_panel_pack_coloradmin" %>
28
- <!-- JavaScript -->
29
-
30
27
  </head>
31
28
  <body>
32
29
 
33
- <!-- Page Container -->
34
- <div id="page-container" class="fade page-sidebar-fixed page-header-fixed">
30
+ <!-- -PHCDev- Page Container -->
31
+ <div id="app" class="app app-header-fixed app-sidebar-fixed app-with-wide-sidebar">
35
32
 
36
- <!-- Page Header -->
37
- <div id="header" class="header navbar-default">
33
+ <!-- -PHCDev- Page Container - Header -->
34
+ <div id="header" class="app-header">
38
35
  <%= render "layouts/phcdevworks_accounts_stripe/components/backend/navigation/top_menu" %>
39
36
  </div>
40
- <!-- Page Header -->
37
+ <!-- -PHCDev- Page Container - Header -->
41
38
 
42
- <!-- Page Sidebar -->
43
- <div id="sidebar" class="sidebar">
39
+ <!-- -PHCDev- Page Container - Sidebar -->
40
+ <div id="sidebar" class="app-sidebar" data-disable-slide-animation="true">
44
41
  <%= render "layouts/phcdevworks_accounts_stripe/components/backend/sidebars/side_menu" %>
45
42
  </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 -->
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 -->
55
46
 
56
- <!-- Footer Content -->
57
- <div id="footer" class="footer mb-4">
58
- <%= render "layouts/phcdevworks_accounts_stripe/components/backend/footer/footer" %>
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_accounts_stripe/components/backend/footer/footer" %>
59
+ </div>
60
+ <!-- -PHCDev- Page Container - Footer -->
61
+ </div>
59
62
  </div>
60
- <!-- Footer Content -->
63
+ <!-- -PHCDev- Page Container - Content -->
61
64
 
62
65
  </div>
63
- <!-- Page Container -->
66
+ <!-- -PHCDev- Page Container -->
67
+
68
+ <!-- JavaScript -->
69
+ <%= javascript_include_tag "coloradmin/phcthemes_admin_panel_pack_coloradmin" %>
70
+ <!-- JavaScript -->
64
71
 
65
72
  </body>
66
73
  </html>
@@ -1,15 +1,17 @@
1
- <!-- -PHC- Footer Content - Left -->
1
+ <!-- -PHCDev- Page Container - Footer - Left -->
2
2
  <span>
3
- <!-- -PHC- 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 Accounts Stripe - Engine v<%= Gem.loaded_specs["phcdevworks_accounts_stripe"].version.to_s %>
6
- <!-- -PHC- Footer Content - Left - Time in Production -->
5
+ <span class="phc_dev_strong_plugin">PHC</span><span class="phc_dev_light_plugin">Devworks</span> Accounts Stripe - Engine v<%= Gem.loaded_specs["phcdevworks_accounts_stripe"].version.to_s %>
6
+ <!-- -PHCDev- Page Container - Footer - Left - Copyright -->
7
7
  </span>
8
- <!-- -PHC- Footer Content - Left -->
8
+ <!-- -PHCDev- Page Container - Footer - Left -->
9
9
 
10
- <!-- -PHC- Footer Content - Right -->
10
+ <!-- -PHCDev- Page Container - Footer - Right -->
11
11
  <span class="float-right">
12
+ <!-- -PHCDev- Page Container - Footer - Right - Developed -->
12
13
  Developed with <i class="fas fa-heart hanna_hearts"></i> by
13
- <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 -->
14
16
  </span>
15
- <!-- -PHC- 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_accounts_stripe.admin_products_path, class: "navbar-brand" do %>
5
- <strong>PHCDevworks</strong>Accounts
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 -->