phcdevworks_core_modules 7.3.0 → 8.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fab22f124a2646684433df0eb111f83eaec82978ad1c151248b747900c776c3
-  data.tar.gz: 02f6f0ad2425491cea6e86834360b926ab1ab3b2d9fef93b3a16785c12d50bfb
+  metadata.gz: d23616b9063567b13732540f15efb1336ac24e0f4981e11aedb699bfcdcec8f0
+  data.tar.gz: b32ade023ecf1d4186d17decbb625d66894c843de2203f1172c4941acace4b35
 SHA512:
-  metadata.gz: 121dddf38b1636a06cc23da2b08891594498d7d048438aa1a55ab72d135c078a2e76c0db9be45e367dfe9c35678df7a4941b3c6e47b25c345b6389ee74c3ce33
-  data.tar.gz: b603fcc68ae8bb0a0d887b8a3420af92a0ad0142f0d1ff12782ada14c272610cae33ec9a1cf823a060ce9b0a0786246c5c57bd30b2bb4befa695d420f8ac6250
+  metadata.gz: 46d36cc97039e660cba97cc7afd8baac228b008219a18dec8aae8290a38a00aa622cff583928179c55762e14cc15c356773f1fe7120d3ae0f2de7394deb94dfd
+  data.tar.gz: 59882e41ee4a7468c5b56f2df770e7f9cae8f5f0422b474d70b24377b932d58a4be91d44022bb8d24f1d7a187f1d1a22a4f71a8c5c879222efeca24e48b258a7

data/MIT-LICENSE

@@ -1,20 +1,20 @@
-Copyright 2020 BradPotts
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright 2022 PHCDevworks
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -0,0 +1,3 @@
+### Status
+
+[![Gem Version](https://badge.fury.io/rb/phcdevworks_core_modules.svg)](https://badge.fury.io/rb/phcdevworks_core_modules) [![Publish to Github.com](https://github.com/phcdevworks/phcdevworks_core_modules/actions/workflows/publish_gem_github_com.yml/badge.svg)](https://github.com/phcdevworks/phcdevworks_core_modules/actions/workflows/publish_gem_github_com.yml) [![Publish to Rubygems.org](https://github.com/phcdevworks/phcdevworks_core_modules/actions/workflows/publish_gem_rubygems_org.yml/badge.svg)](https://github.com/phcdevworks/phcdevworks_core_modules/actions/workflows/publish_gem_rubygems_org.yml)

data/Rakefile

@@ -1,8 +1,8 @@
-require "bundler/setup"
-
-APP_RAKEFILE = File.expand_path("spec/test_app/Rakefile", __dir__)
-load "rails/tasks/engine.rake"
-
-load "rails/tasks/statistics.rake"
-
-require "bundler/gem_tasks"
+require "bundler/setup"
+
+APP_RAKEFILE = File.expand_path("spec/test_app/Rakefile", __dir__)
+load "rails/tasks/engine.rake"
+
+load "rails/tasks/statistics.rake"
+
+require "bundler/gem_tasks"

data/app/assets/config/phcdevworks_core_modules_manifest.js

@@ -1,3 +1,2 @@
-//= link_directory ../stylesheets/phcdevworks_core_modules .scss
-//= link phcthemes_admin_panel_pack_coloradmin.css
-//= link phcthemes_admin_panel_pack_coloradmin.js
+//= link coloradmin/default/phcthemes_admin_panel_pack_coloradmin.css
+//= link coloradmin/phcthemes_admin_panel_pack_coloradmin.js

data/app/models/phcdevworks_core_modules/affiliate/link.rb

@@ -16,7 +16,7 @@ module PhcdevworksCoreModules
     has_paper_trail versions: {class_name: "PhcdevworksCoreModules::AffiliateLinkVersions"}
 
     # Relationships for Local
-    belongs_to :user, class_name: "PhcdevworksAccounts::User"
+    belongs_to :user, class_name: "PhcdevworksAccountsDevise::User"
 
     if defined?phcdevworks_press
       has_many :posts, class_name: "PhcdevworksPress::Article::Post"

data/app/models/phcdevworks_core_modules/marketing/optimization.rb

@@ -12,7 +12,7 @@ module PhcdevworksCoreModules
     has_paper_trail versions: {class_name: "PhcdevworksCoreModules::MarketingOptimizationVersions"}
 
     # Relationships for Local
-    belongs_to :user, class_name: "PhcdevworksAccounts::User"
+    belongs_to :user, class_name: "PhcdevworksAccountsDevise::User"
     has_many :categories, class_name: "PhcdevworksCoreModules::Post::Category"
 
     # Relationships for PHCDevworks Plugins

data/app/models/phcdevworks_core_modules/post/category.rb

@@ -8,7 +8,7 @@ module PhcdevworksCoreModules
     has_paper_trail :class_name => "PhcdevworksCoreModules::PostCategoryVersions"
 
     # Relationships for Local
-    belongs_to :user, class_name: "PhcdevworksAccounts::User"
+    belongs_to :user, class_name: "PhcdevworksAccountsDevise::User"
     belongs_to :optimization, class_name: "PhcdevworksCoreModules::Marketing::Optimization", optional: true
 
     # Relationships for PHCDevworks Plugins

data/app/views/layouts/phcdevworks_core_modules/application.html.erb

@@ -1,131 +1,73 @@
-<!DOCTYPE html>
-<html>
-<head>
-
-    <!-- SEO System -->
-    <% phc_seo_title "PHCDevworks Core Modules" %>
-    <% phc_seo_description "Ruby on Rails 6 core plugin for PHCDevworks plugins with common modules to handle functions universally handle common functions." %>
-    <!-- SEO System -->
-
-    <!-- SEO and Site Description -->
-	<meta charset="utf-8">
-	<title><%= yield(:phc_seo_title) %></title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
-	<meta name="description" content="<%= yield(:phc_seo_description) %>">
-    <!-- SEO and Site Description -->
-
-    <!-- Rails Security Tags -->
-    <%= csrf_meta_tags %>
-    <%= csp_meta_tag %>
-    <!-- Rails Security Tags -->
-
-    <!-- CSS Styles -->
-    <%= stylesheet_link_tag "phcthemes_admin_panel_pack_coloradmin", media: "all" %>
-    <!-- CSS Styles -->
-
-    <!-- JavaScript -->
-    <%= javascript_include_tag "phcthemes_admin_panel_pack_coloradmin" %>
-    <!-- JavaScript -->
-
-</head>
-<body>
-
-    <!-- Page Container -->
-    <div id="page-container" class="fade page-sidebar-fixed page-header-fixed">
-
-        <!-- Page Header -->
-        <div id="header" class="header navbar-default">
-            <%= render "layouts/phcdevworks_core_modules/components/backend/navigation/top_menu" %>
-        </div>
-        <!-- Page Header -->
-
-        <!-- Page Sidebar -->
-        <div id="sidebar" class="sidebar">
-            <%= render "layouts/phcdevworks_core_modules/components/backend/sidebars/side_menu" %>
-        </div>
-        <div class="sidebar-bg"></div>
-        <!-- Page Sidebar -->
-
-        <!-- Page Content -->
-        <div id="content" class="content">
-            <%= render "phcdevworks_notifications/bootstrap/notifications" %>
-            <%= yield %>
-        </div>
-        <!-- Page Content -->
-
-        <!-- Footer Content -->
-        <div id="footer" class="footer mb-4">
-            <%= render "layouts/phcdevworks_core_modules/components/backend/footer/footer" %>
-        </div>
-        <!-- Footer Content -->
-
-    </div>
-    <!-- Page Container -->
-
-    <!-- JavaScript CKEditor -->
-	<script>ClassicEditor
-        .create( document.querySelector( '.editor' ), {
-        	toolbar: {
-        		items: [
-        		    'heading',
-        			'|',
-        			'fontBackgroundColor',
-        			'fontColor',
-        			'horizontalLine',
-        			'fontSize',
-        			'fontFamily',
-        			'highlight',
-        			'|',
-        			'bold',
-        			'underline',
-        			'italic',
-        			'strikethrough',
-        			'link',
-        			'removeFormat',
-        			'|',
-        			'alignment',
-        			'indent',
-        			'outdent',
-        			'|',
-        			'blockQuote',
-        			'insertTable',
-        			'undo',
-        			'redo',
-        			'|',
-        			'subscript',
-        			'superscript',
-        			'|',
-        			'codeBlock',
-        			'code',
-        			'|',
-        			'MathType',
-        			'ChemType',
-        			'specialCharacters'
-        		]
-        	},
-        	language: 'en',
-        	table: {
-        		contentToolbar: [
-        			'tableColumn',
-        			'tableRow',
-        			'mergeTableCells',
-        			'tableCellProperties',
-        			'tableProperties'
-        		]
-        	},
-        	licenseKey: '',
-        } )
-        .then( editor => {
-        	window.editor = editor;
-        } )
-        .catch( error => {
-        	console.error( 'Oops, something gone wrong!' );
-        	console.error( 'Please, report the following error in the https://github.com/ckeditor/ckeditor5 with the build id and the error stack trace:' );
-        	console.warn( 'Build id: ulhl6ym1zxhr-qh8kt6relt0l' );
-        	console.error( error );
-        } );
-	</script>
-    <!-- JavaScript CKEditor -->
-
-</body>
-</html>
+<!DOCTYPE html>
+<html>
+<head>
+
+    <!-- SEO System -->
+    <% phc_seo_title "PHCDevworks Core Modules" %>
+    <% phc_seo_description "Ruby on Rails 7 core plugin for PHCDevworks plugins with common modules to handle functions universally handle common functions." %>
+    <!-- SEO System -->
+
+    <!-- SEO and Site Description -->
+	<meta charset="utf-8">
+	<title><%= yield(:phc_seo_title) %></title>
+    <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" name="viewport" />
+	<meta name="description" content="<%= yield(:phc_seo_description) %>">
+    <!-- SEO and Site Description -->
+
+    <!-- Rails Security Tags -->
+    <%= csrf_meta_tags %>
+    <%= csp_meta_tag %>
+    <!-- Rails Security Tags -->
+
+    <!-- CSS Styles -->
+    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" />
+    <%= stylesheet_link_tag "coloradmin/default/phcthemes_admin_panel_pack_coloradmin", media: "all" %>
+    <!-- CSS Styles -->
+
+</head>
+<body>
+
+    <!-- -PHCDEV- Page Container -->
+    <div id="app" class="app app-header-fixed app-sidebar-fixed app-with-wide-sidebar">
+
+        <!-- -PHCDEV- Page Container - Header -->
+        <div id="header" class="app-header">
+            <%= render "layouts/phcdevworks_core_modules/components/backend/navigation/top_menu" %>
+        </div>
+        <!-- -PHCDEV- Page Container - Header -->
+
+        <!-- -PHCDEV- Page Container - Sidebar -->
+        <div id="sidebar" class="app-sidebar" data-disable-slide-animation="true">
+            <%= render "layouts/phcdevworks_core_modules/components/backend/sidebars/side_menu" %>
+        </div>
+        <div class="app-sidebar-bg"></div>
+        <div class="app-sidebar-mobile-backdrop"><a href="#" data-dismiss="app-sidebar-mobile" class="stretched-link"></a></div>
+        <!-- -PHCDEV- Page Container - Sidebar -->
+
+        <!-- -PHCDEV- Page Container - Content -->
+        <div id="app" class="app app-content-full-height">
+            <div id="content" class="app-content d-flex flex-column p-0">
+                <!-- -PHCDEV- Page Container - Main -->
+                <div class="app-content-padding flex-grow-1 overflow-hidden" data-scrollbar="true" data-height="100%">
+                    <%= render "phcdevworks_notifications/bootstrap/notifications" %>
+                    <%= yield %>
+                </div>
+                <!-- -PHCDEV- Page Container - Main -->
+                <!-- -PHCDEV- Page Container - Footer -->
+                <div id="footer" class="app-footer m-0">
+                    <%= render "layouts/phcdevworks_core_modules/components/backend/footer/footer" %>
+                </div>
+                <!-- -PHCDEV- Page Container - Footer -->
+            </div>
+        </div>
+        <!-- -PHCDEV- Page Container - Content -->
+
+    </div>
+    <!-- -PHCDEV- Page Container -->
+
+    <!-- JavaScript -->
+    <%= javascript_include_tag "coloradmin/phcthemes_admin_panel_pack_coloradmin" %>
+    <!-- JavaScript -->
+
+</body>
+</html>

data/app/views/layouts/phcdevworks_core_modules/components/backend/footer/_footer.html.erb

@@ -1,16 +1,17 @@
-<!-- Footer Content - Left -->
+<!-- -PHCDEV- Page Container - Footer - Left -->
 <span>
-    <!-- Footer Content - Left - Time in Production -->
+    <!-- -PHCDEV- Page Container - Footer - Left - Copyright -->
     <i class="fab fa-osi font-weight-bolder"></i> 2012-<%= Time.now.year %> -
-    <span class="font-weight-bold">PHC</span>Devworks Core -
-    Engine v<%= Gem.loaded_specs["phcdevworks_core_modules"].version.to_s %>
-    <!-- Footer Content - Left - Time in Production -->
+    <span class="phc_dev_strong_plugin">PHC</span><span class="phc_dev_light_plugin">Devworks</span> Core Modules - Engine v<%= Gem.loaded_specs["phcdevworks_core_modules"].version.to_s %>
+    <!-- -PHCDEV- Page Container - Footer - Left - Copyright -->
 </span>
-<!-- Footer Content - Left -->
+<!-- -PHCDEV- Page Container - Footer - Left -->
 
-<!-- Footer Content - Right -->
+<!-- -PHCDEV- Page Container - Footer - Right -->
 <span class="float-right">
+    <!-- -PHCDEV- Page Container - Footer - Right - Developed -->
     Developed with <i class="fas fa-heart hanna_hearts"></i> by
-    <a class="phcnet_copyright text-dark" href="https://phcdevworks.com/"><u><span class="font-weight-bold">PHC</span>Devworks</u></a>
+    <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>
+    <!-- -PHCDEV- Page Container - Footer - Right - Developed -->
 </span>
-<!-- Footer Content - Right -->
+<!-- -PHCDEV- Page Container - Footer - Right -->

data/app/views/layouts/phcdevworks_core_modules/components/backend/navigation/_top_menu.html.erb

@@ -1,40 +1,41 @@
-<!-- -PHC- Topbar - Navigation Header -->
+<!-- -PHCDEV- Topbar - Navigation Header -->
 <div class="navbar-header">
 
-    <%= link_to phcdevworks_core_modules.post_categories_path, class: "navbar-brand" do %>
-        <strong>PHCDevworks</strong>Press
-    <% end %>
-
-    <button type="button" class="navbar-toggle" data-click="sidebar-toggled">
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
+    <button type="button" class="navbar-mobile-toggler" data-toggle="app-sidebar-mobile">
+    <span class="icon-bar"></span>
+    <span class="icon-bar"></span>
+    <span class="icon-bar"></span>
     </button>
 
+    <%= link_to phcdevworks_accounts_devise.user_path, class: "navbar-brand" do %>
+        <span class="phc_dev_strong_plugin_logo">PHC</span><span class="phc_dev_light_plugin_logo">Devworks</span>
+    <% end %>
+
 </div>
-<!-- -PHC- Topbar - Navigation Header -->
+<!-- -PHCDEV- Topbar - Navigation Header -->
     
-<!-- -PHC- Topbar - Navigation Main -->
+<!-- -PHCDEV- Topbar - Navigation Main -->
 <% if current_user %>
-    <ul class="navbar-nav navbar-right">
-
-        <!-- -PHC- Topbar - Navigation Main - User Menu -->
-        <li class="dropdown navbar-user">
-            <a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown">
+    <div class="navbar-nav">
+        <div class="navbar-item navbar-user dropdown">
+            <a href="#" class="navbar-link dropdown-toggle d-flex align-items-center" data-bs-toggle="dropdown">
                 <%= image_tag current_user.gravatar_url %>
-                <span class="d-none d-md-inline"><%= current_user.firstname + " " + current_user.lastname  %></span> <b class="caret"></b>
+                <span>
+                    <span class="d-none d-md-inline"><%= current_user.firstname + " " + current_user.lastname %></span>
+                    <b class="caret"></b>
+                </span>
             </a>
-            <div class="dropdown-menu dropdown-menu-right">
-                <%= link_to phcdevworks_accounts.edit_user_registration_path, class: "dropdown-item" do %>
+            <div class="dropdown-menu dropdown-menu-end me-1">
+                <%= link_to phcdevworks_accounts_devise.edit_user_registration_path, class: "dropdown-item" do %>
                     <i class="fad fa-cogs"></i> Account Settings
                 <% end %>
-                <%= link_to phcdevworks_accounts.destroy_user_session_path, method: :delete, class: "dropdown-item" do %>
+                <%= link_to phcdevworks_accounts_devise.destroy_user_session_path, method: :delete, class: "dropdown-item" do %>
                     <i class="fad fa-sign-out-alt"></i> Logout
                 <% end %>
             </div>
-        </li>
-        <!-- -PHC- Topbar - Navigation Main - User Menu -->
-
-    </ul>
+        </div>
+    </div>
 <% end %>
-<!-- -PHC- Topbar - Navigation Main -->
+
+</div>
+<!-- -PHCDEV- Topbar - Navigation Main -->