updated layout footer/header.

PHCDevworksArchives · Apr 3, 2022 · 4988bd5 · 4988bd5
1 parent aba34ab
commit 4988bd5
Show file tree

Hide file tree

Showing 5 changed files with 96 additions and 118 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    phcdevworks_accounts_stripe (1.0.1)
+    phcdevworks_accounts_stripe (1.0.2)
       aws-sdk-s3 (~> 1.113)
       devise (~> 4.8)
       friendly_id (~> 5.4)
@@ -91,7 +91,7 @@ GEM
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     aws-eventstream (1.2.0)
-    aws-partitions (1.568.0)
+    aws-partitions (1.573.0)
     aws-sdk-core (3.130.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
@@ -108,7 +108,7 @@ GEM
       aws-eventstream (~> 1, >= 1.0.2)
     bcrypt (3.1.17)
     builder (3.2.4)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     crass (1.0.6)
     declarative (0.0.20)
     devise (4.8.1)
@@ -127,29 +127,10 @@ GEM
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    faraday (1.10.0)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0)
-      faraday-multipart (~> 1.0)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.0)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      faraday-retry (~> 1.0)
+    faraday (2.2.0)
+      faraday-net_http (~> 2.0)
       ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.3)
-      multipart-post (>= 1.2, < 3)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
+    faraday-net_http (2.0.1)
     ffi (1.15.5)
     friendly_id (5.4.2)
       activerecord (>= 4.0.0)
@@ -171,8 +152,8 @@ GEM
     google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.5.0)
-      faraday (>= 0.17.3, < 2.0)
+    google-cloud-env (1.6.0)
+      faraday (>= 0.17.3, < 3.0)
     google-cloud-errors (1.2.0)
     google-cloud-storage (1.36.1)
       addressable (~> 2.8)
@@ -196,13 +177,12 @@ GEM
     inline_svg (1.8.0)
       activesupport (>= 3.0)
       nokogiri (>= 1.6)
-    io-wait (0.2.1)
     jbuilder (2.11.5)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
     jmespath (1.6.1)
     jwt (2.3.0)
-    loofah (2.15.0)
+    loofah (2.16.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -217,7 +197,6 @@ GEM
     mini_mime (1.1.2)
     minitest (5.15.0)
     multi_json (1.15.0)
-    multipart-post (2.1.1)
     net-imap (0.2.3)
       digest
       net-protocol
@@ -226,8 +205,7 @@ GEM
       digest
       net-protocol
       timeout
-    net-protocol (0.1.2)
-      io-wait
+    net-protocol (0.1.3)
       timeout
     net-smtp (0.3.1)
       digest
@@ -241,7 +219,7 @@ GEM
     paper_trail (12.3.0)
       activerecord (>= 5.2)
       request_store (~> 1.1)
-    phcdevworks_accounts_devise (0.1.2.pre.beta)
+    phcdevworks_accounts_devise (0.1.3.pre.beta)
       aws-sdk-s3 (~> 1.113)
       devise (~> 4.8)
       friendly_id (~> 5.4)
@@ -275,12 +253,12 @@ GEM
       phcthemes_admin_panel_pack (~> 5.1)
       phcthemes_web_theme_pack (~> 5.0)
       rails (~> 7.0)
-    phcthemes_admin_panel_pack (5.1.2)
+    phcthemes_admin_panel_pack (5.1.5)
       gravtastic (~> 3.2)
       inline_svg (~> 1.7)
       rails (~> 7.0)
       sassc-rails (~> 2.1)
-    phcthemes_web_theme_pack (5.0.0)
+    phcthemes_web_theme_pack (5.0.3)
       gravtastic (~> 3.2)
       inline_svg (~> 1.7)
       rails (~> 7.0)
@@ -333,7 +311,7 @@ GEM
     rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-rails (5.1.1)
@@ -370,7 +348,7 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     sqlite3 (1.4.2)
-    stripe (5.45.0)
+    stripe (5.48.0)
     strscan (3.0.1)
     thor (1.2.1)
     tilt (2.0.10)

diff --git a/app/views/layouts/phcdevworks_accounts_stripe/application.html.erb b/app/views/layouts/phcdevworks_accounts_stripe/application.html.erb
@@ -1,73 +1,73 @@
-<!DOCTYPE html>
-<html>
-<head>
-
-    <!-- SEO System -->
-    <% phc_seo_title "PHCDevworks Accounts" %>
-    <% phc_seo_description "Ruby on Rails 6 Authentication and User Management Engine." %>
-    <!-- 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_accounts_stripe/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_accounts_stripe/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_accounts_stripe/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>
+<!DOCTYPE html>
+<html>
+<head>
+
+    <!-- SEO System -->
+    <% phc_seo_title "PHCDevworks Accounts Stripe" %>
+    <% phc_seo_description "Ruby on Rails 7 Stripe Addon for PHCDevworks Accounts plugin." %>
+    <!-- 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_accounts_stripe/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_accounts_stripe/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_accounts_stripe/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>
diff --git a/app/views/layouts/phcdevworks_accounts_stripe/components/backend/footer/_footer.html.erb b/app/views/layouts/phcdevworks_accounts_stripe/components/backend/footer/_footer.html.erb
@@ -2,7 +2,7 @@
 <span>
     <!-- -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 Accounts (Devise) - Engine v<%= Gem.loaded_specs["phcdevworks_accounts_stripe"].version.to_s %>
+    <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 %>
     <!-- -PHCDev- Page Container - Footer - Left - Copyright -->
 </span>
 <!-- -PHCDev- Page Container - Footer - Left -->
@@ -11,7 +11,7 @@
 <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>
 <!-- -PHCDev- Page Container - Footer - Right -->
diff --git a/...iews/layouts/phcdevworks_accounts_stripe/components/backend/navigation/_top_menu.html.erb b/...iews/layouts/phcdevworks_accounts_stripe/components/backend/navigation/_top_menu.html.erb
@@ -1,4 +1,4 @@
-<!-- -PHC- Topbar - Navigation Header -->
+<!-- -PHCDev- Topbar - Navigation Header -->
 <div class="navbar-header">
 
     <button type="button" class="navbar-mobile-toggler" data-toggle="app-sidebar-mobile">
@@ -8,13 +8,13 @@
     </button>
 
     <%= link_to phcdevworks_accounts_devise.user_path, class: "navbar-brand" do %>
-        <strong>PHCDevworks</strong>Accounts
+        <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 %>
     <div class="navbar-nav">
         <div class="navbar-item navbar-user dropdown">
@@ -38,4 +38,4 @@
 <% end %>
 
 </div>
-<!-- -PHC- Topbar - Navigation Main -->
+<!-- -PHCDev- Topbar - Navigation Main -->
diff --git a/lib/phcdevworks_accounts_stripe/version.rb b/lib/phcdevworks_accounts_stripe/version.rb
@@ -1,3 +1,3 @@
 module PhcdevworksAccountsStripe
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end