phcmembers 19.0.0 → 19.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d6db352a07d4abb2769113b1ddf81ff495df53d
-  data.tar.gz: 2e38f4a9d71d64cc033c1797d541e395f1b4b815
+  metadata.gz: 1bb579bb6174b280fbf89d038082c197a13efa86
+  data.tar.gz: ddaf057f01faf0a634216802c5bfda42cf311480
 SHA512:
-  metadata.gz: d99efb4d2a37c8d0db970959d4c6adab8e0a3806087808f3c1413cda64ed15647130937c59c7511a967813595a2dff1356b72bb9b5bcad61355c7b9035e99bd8
-  data.tar.gz: 1eafce8c8e5cbf522a8b268f4f624c40b10a719338948116788b104de5e2c10ad5986632778e1f0eb8271585d1213aa673e5f83dcdec1d8dcc2b0ba2d51b022d
+  metadata.gz: 4d0be3bfd4eba11f73f0082496044a5ee7a9d974a95c124a65278a9775c7ebdbc43790e648a7a94cb2213b231dfa65674c2a6d37fdbba7aca1902357425681d5
+  data.tar.gz: cabf5a88a39c36a0a2870f4de68ca0699b61b65bc91670687c7e42de8ab0f3affe2e58cd37d4c557230f37fe1239ee9290d2c1a084a322af3d33387bbaa21909

data/app/controllers/phcmembers/directory/categories_controller.rb

@@ -64,7 +64,7 @@ module Phcmembers
 
     # Whitelist
     def directory_category_params
-      params.require(:directory_category).permit(:catname, :slug, :user_id, :user_name)
+      params.require(:directory_category).permit(:catname, :slug, :user_id, :username)
     end
 
   end

data/app/controllers/phcmembers/member/addresses_controller.rb

@@ -71,7 +71,7 @@ module Phcmembers
 
     # Whitelist
     def member_address_params
-      params.require(:member_address).permit(:mcaddressl1, :mcaddressl2, :mccity, :mcprovince, :mccountry, :mcpostalcode, :mctype, :slug, :user_id, :user_name, :profile_id)
+      params.require(:member_address).permit(:mcaddressl1, :mcaddressl2, :mccity, :mcprovince, :mccountry, :mcpostalcode, :mctype, :slug, :user_id, :username, :profile_id)
     end
 
   end

data/app/controllers/phcmembers/member/listings_controller.rb

@@ -73,7 +73,7 @@ module Phcmembers
 
     # Whitelist
     def member_listing_params
-      params.require(:member_listing).permit(:mbcompanyname, :mbcontactname, :mbaddressl1, :mbaddressl2, :mbcity, :mbcountry, :mbprovince, :mbpostalcode, :mbphone, :mbcontactemail, :mbwebsite, :slug, :user_id, :user_name, :profile_id, category_ids: [])
+      params.require(:member_listing).permit(:mbcompanyname, :mbcontactname, :mbaddressl1, :mbaddressl2, :mbcity, :mbcountry, :mbprovince, :mbpostalcode, :mbphone, :mbcontactemail, :mbwebsite, :slug, :user_id, :username, :profile_id, category_ids: [])
     end
 
   end

data/app/controllers/phcmembers/member/profiles_controller.rb

@@ -64,7 +64,7 @@ module Phcmembers
 
     # Whitelist
     def member_profile_params
-      params.require(:member_profile).permit(:mfirstname, :mlastname, :mtitle, :memail, :mphone, :mnotes, :slug, :user_id, :user_name)
+      params.require(:member_profile).permit(:mfirstname, :mlastname, :mtitle, :memail, :mphone, :mnotes, :slug, :user_id, :username)
     end
 
   end

data/app/views/layouts/phcmembers/components/backend/topbar/_topbar.html.erb

@@ -1,5 +1,15 @@
 <!-- Mobile Toggle -->
 <a href="#" class="sidebar-toggle" data-toggle="offcanvas" role="button">
-	<span class="sr-only">Toggle navigation</span>
+<span class="sr-only">Toggle navigation</span>
 </a>
 <!-- Mobile Toggle -->
+
+<% if user_signed_in? %>
+	<!-- User Right Menu Bar -->
+	<div class="navbar-custom-menu">
+		<ul class="nav navbar-nav">
+			<%= render 'layouts/components/backend/topbar/topbar_user_menu' %>
+		</ul>
+	<div>
+	<!-- User Right Menu Bar -->
+<% end %>

data/app/views/layouts/phcmembers/components/backend/topbar/_topbar_user_menu.html.erb

@@ -0,0 +1,42 @@
+<li class="dropdown user user-menu">
+  <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+    <!-- <img src="dist/img/user2-160x160.jpg" class="user-image" alt="User Image"> -->
+    <span class="hidden-xs"><%= current_user.firstname %> <%= current_user.lastname %></span>
+  </a>
+  <ul class="dropdown-menu">
+
+    <li class="user-header">
+      <!-- <img src="dist/img/user2-160x160.jpg" class="img-circle" alt="User Image"> -->
+      <p><%= current_user.firstname %> <%= current_user.lastname %></p>
+      <p><%= current_user.email %></p>
+    </li>
+
+    <li class="user-body">
+      <div class="row">
+        <div class="col-xs-4 text-center">
+          <a href="#"></a>
+        </div>
+        <div class="col-xs-4 text-center">
+          <a href="#"></a>
+        </div>
+        <div class="col-xs-4 text-center">
+          <a href="#"></a>
+        </div>
+      </div>
+    </li>
+
+    <li class="user-footer">
+      <div class="pull-left">
+        <%= link_to(main_app.edit_user_registration_path, class: "btn btn-primary") do %>
+          Edit Profile
+        <% end %>
+      </div>
+      <div class="pull-right">
+        <%= link_to(main_app.destroy_user_session_path, method: :delete, class: "btn btn-primary") do %>
+          Log Out
+        <% end %>
+      </div>
+    </li>
+
+  </ul>
+</li>

data/lib/phcmembers/version.rb

@@ -1,3 +1,3 @@
 module Phcmembers
-  VERSION = "19.0.0"
+  VERSION = "19.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phcmembers
 version: !ruby/object:Gem::Version
-  version: 19.0.0
+  version: 19.1.0
 platform: ruby
 authors:
 - BradPotts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-15 00:00:00.000000000 Z
+date: 2017-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -713,7 +713,7 @@ files:
 - app/views/layouts/phcmembers/components/backend/footer/_footer.html.erb
 - app/views/layouts/phcmembers/components/backend/navigation/_navigation.html.erb
 - app/views/layouts/phcmembers/components/backend/topbar/_topbar.html.erb
-- app/views/layouts/phcmembers/components/backend/topbar/_topbar_links.html.erb
+- app/views/layouts/phcmembers/components/backend/topbar/_topbar_user_menu.html.erb
 - app/views/layouts/phcmembers/directory/directory_all.html.erb
 - app/views/layouts/phcmembers/members/members_all.html.erb
 - app/views/phcmembers/directory/categories/_form.html.erb