phcmembers 3.0.1 → 4.0.0

data/app/views/phcmembers/member/profiles/show.html.erb

@@ -0,0 +1,35 @@
+<!-- Title Variables -->
+<% phc_title "PHCMembers - Member Profile Manager" %>
+<% phc_title_tagline "Detailed Profile for " + @member_profile.mfirstname + " " + @member_profile.mlastname %>
+
+<!-- Page Header -->
+<div class="row">
+	<div class="col-lg-12">
+
+		<!-- Bread Crumbs -->
+		<ol class="breadcrumb">
+			<li><%= link_to "Dashboard", member_root_path %></li>
+			<li><%= link_to "Member Profile List", member_profiles_path %></li>
+			<li class="active"><%= yield(:phc_title_tagline) %></li>
+		</ol>
+
+		<!-- Page Title -->
+		<h3 class="page-title">
+			<%= yield(:phc_title) %> </br>
+			<small><%= yield(:phc_title_tagline) %></small>
+		</h3>
+
+	</div>
+</div>
+
+<!-- Main Content -->
+<div class="row">
+
+	<div class="col-md-3">
+		<%= render 'phcmembers/member/profiles/components/profile_sidebar' %>
+	</div>
+	<div class="col-md-9">
+		<%= render 'phcmembers/member/profiles/components/profile_main' %>
+	</div>
+
+</div>

data/config/routes.rb

@@ -15,34 +15,28 @@ Phcmembers::Engine.routes.draw do
 
 	# Application Client Backend
 
-	namespace :members do
+	# Members Section
+	namespace :member do
 
 		# Members Main Index
-		root 'mains#index'
+		root 'profiles#index'
 
 		# Member Routes
-		resources :mains do
-
-			# Member Routes
-			resources :businesses
-			resources :contacts
-			
-			# Auto Complete Routes
-			get :autocomplete_members_contact_mccompanyname, :on => :collection
-
+		resources :profiles, class_name: 'Phcmembers::Member::Profile' do
+			resources :listings, class_name: 'Phcmembers::Member::Listing'
+			resources :addresses, class_name: 'Phcmembers::Member::Address'
 		end
 
 	end
 
+	# Directory Section
 	namespace :directory do
 
 		# Members Main Index
 		root 'categories#index'
 
-		resources :categories do
-			resources :listings
-		end
-
+		resources :categories, class_name: 'Phcmembers::Directory::Category'
+		resources :categorylistings, class_name: 'Phcmembers::Directory::Categorylisting'
 	end
 
 end

data/db/migrate/20160724220339_create_phcmembers_member_profiles.rb

@@ -0,0 +1,16 @@
+class CreatePhcmembersMemberProfiles < ActiveRecord::Migration[5.0]
+	def change
+		create_table :phcmembers_member_profiles do |t|
+
+			t.string :mfirstname
+			t.string :mlastname
+			t.string :mtitle
+			t.string :memail
+			t.string :mphone
+			t.string :mnotes
+
+			t.timestamps
+
+		end
+	end
+end

data/db/migrate/{20160706184249_create_phcmembers_members_contacts.rb → 20160725153306_create_phcmembers_member_addresses.rb}

@@ -1,6 +1,6 @@
-class CreatePhcmembersMembersContacts < ActiveRecord::Migration[5.0]
+class CreatePhcmembersMemberAddresses < ActiveRecord::Migration[5.0]
 	def change
-		create_table :phcmembers_members_contacts do |t|
+		create_table :phcmembers_member_addresses do |t|
 
 			t.string :mcaddressl1
 			t.string :mcaddressl2
@@ -9,8 +9,8 @@ class CreatePhcmembersMembersContacts < ActiveRecord::Migration[5.0]
 			t.string :mccountry
 			t.string :mcpostalcode
 			t.string :mctype
-
-			t.references :main, index: true
+			
+			t.references :profile
 
 			t.timestamps
 

data/db/migrate/{20160706184708_create_phcmembers_directory_categories.rb → 20160725182257_create_phcmembers_directory_categories.rb}

@@ -3,8 +3,6 @@ class CreatePhcmembersDirectoryCategories < ActiveRecord::Migration[5.0]
 		create_table :phcmembers_directory_categories do |t|
 
 			t.string :catname
-			
-			t.references :business, index: true
 
 			t.timestamps
 

data/db/migrate/{20160706184011_create_phcmembers_members_businesses.rb → 20160727024006_create_phcmembers_member_listings.rb}

@@ -1,6 +1,6 @@
-class CreatePhcmembersMembersBusinesses < ActiveRecord::Migration[5.0]
+class CreatePhcmembersMemberListings < ActiveRecord::Migration[5.0]
 	def change
-		create_table :phcmembers_members_businesses do |t|
+		create_table :phcmembers_member_listings do |t|
 
 			t.string :mbcompanyname
 			t.string :mbcontactname
@@ -13,14 +13,10 @@ class CreatePhcmembersMembersBusinesses < ActiveRecord::Migration[5.0]
 			t.string :mbphone
 			t.string :mbcontactemail
 			t.string :mbwebsite
+			
+			t.references :profile
 
-			t.references :main, index: true
-
-			t.string :user_id
-			t.string :membership_id
-			t.string :oganization_id
-
-			t.timestamps null: false
+			t.timestamps
 
 		end
 	end

data/db/migrate/20160727042756_create_phcmembers_directory_categorylistings.rb

@@ -0,0 +1,10 @@
+class CreatePhcmembersDirectoryCategorylistings < ActiveRecord::Migration[5.0]
+	def change
+		create_table :phcmembers_directory_categorylistings do |t|
+
+			t.references :category
+			t.references :listing
+
+		end
+	end
+end

data/lib/phcmembers/version.rb

@@ -1,3 +1,3 @@
 module Phcmembers
-	VERSION = "3.0.1"
+	VERSION = "4.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phcmembers
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Brad Potts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-15 00:00:00.000000000 Z
+date: 2016-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -504,22 +504,26 @@ files:
 - app/controllers/phcmembers/application_controller.rb
 - app/controllers/phcmembers/dashboard/mains_controller.rb
 - app/controllers/phcmembers/directory/categories_controller.rb
-- app/controllers/phcmembers/directory/listings_controller.rb
-- app/controllers/phcmembers/members/businesses_controller.rb
-- app/controllers/phcmembers/members/contacts_controller.rb
-- app/controllers/phcmembers/members/mains_controller.rb
+- app/controllers/phcmembers/directory/categorylistings_controller.rb
+- app/controllers/phcmembers/member/addresses_controller.rb
+- app/controllers/phcmembers/member/listings_controller.rb
+- app/controllers/phcmembers/member/profiles_controller.rb
 - app/helpers/phcmembers/application_helper.rb
+- app/helpers/phcmembers/directory/categories_helper.rb
+- app/helpers/phcmembers/directory/categorylistings_helper.rb
+- app/helpers/phcmembers/member/listings_helper.rb
 - app/jobs/phcmembers/application_job.rb
 - app/mailers/phcmembers/application_mailer.rb
 - app/models/phcmembers/api.rb
 - app/models/phcmembers/application_record.rb
+- app/models/phcmembers/connections.rb
 - app/models/phcmembers/directory.rb
 - app/models/phcmembers/directory/category.rb
-- app/models/phcmembers/directory/listing.rb
-- app/models/phcmembers/members.rb
-- app/models/phcmembers/members/business.rb
-- app/models/phcmembers/members/contact.rb
-- app/models/phcmembers/members/main.rb
+- app/models/phcmembers/directory/categorylisting.rb
+- app/models/phcmembers/member.rb
+- app/models/phcmembers/member/address.rb
+- app/models/phcmembers/member/listing.rb
+- app/models/phcmembers/member/profile.rb
 - app/views/layouts/phcmembers/application.html.erb
 - app/views/layouts/phcmembers/directory/directory_all.html.erb
 - app/views/layouts/phcmembers/members/members_all.html.erb
@@ -531,47 +535,38 @@ files:
 - app/views/phcmembers/directory/categories/index.html.erb
 - app/views/phcmembers/directory/categories/new.html.erb
 - app/views/phcmembers/directory/categories/show.html.erb
-- app/views/phcmembers/directory/listings/_form.html.erb
-- app/views/phcmembers/directory/listings/_formpatch.html.erb
-- app/views/phcmembers/directory/listings/components/_listing_audits.html.erb
-- app/views/phcmembers/directory/listings/components/_listing_list.html.erb
-- app/views/phcmembers/directory/listings/components/_listing_main.html.erb
-- app/views/phcmembers/directory/listings/edit.html.erb
-- app/views/phcmembers/directory/listings/index.html.erb
-- app/views/phcmembers/directory/listings/new.html.erb
-- app/views/phcmembers/directory/listings/show.html.erb
-- app/views/phcmembers/members/businesses/_form.html.erb
-- app/views/phcmembers/members/businesses/_formpatch.html.erb
-- app/views/phcmembers/members/businesses/components/_business_address.html.erb
-- app/views/phcmembers/members/businesses/components/_business_audits.html.erb
-- app/views/phcmembers/members/businesses/components/_business_main.html.erb
-- app/views/phcmembers/members/businesses/edit.html.erb
-- app/views/phcmembers/members/businesses/index.html.erb
-- app/views/phcmembers/members/businesses/new.html.erb
-- app/views/phcmembers/members/businesses/show.html.erb
-- app/views/phcmembers/members/contacts/_form.html.erb
-- app/views/phcmembers/members/contacts/_formpatch.html.erb
-- app/views/phcmembers/members/contacts/components/_contact_address.html.erb
-- app/views/phcmembers/members/contacts/components/_contact_audits.html.erb
-- app/views/phcmembers/members/contacts/components/_contact_main.html.erb
-- app/views/phcmembers/members/contacts/edit.html.erb
-- app/views/phcmembers/members/contacts/index.html.erb
-- app/views/phcmembers/members/contacts/new.html.erb
-- app/views/phcmembers/members/contacts/show.html.erb
-- app/views/phcmembers/members/mains/_form.html.erb
-- app/views/phcmembers/members/mains/components/_profile_main.html.erb
-- app/views/phcmembers/members/mains/components/_profile_sidebar.html.erb
-- app/views/phcmembers/members/mains/edit.html.erb
-- app/views/phcmembers/members/mains/index.html.erb
-- app/views/phcmembers/members/mains/new.html.erb
-- app/views/phcmembers/members/mains/show.html.erb
+- app/views/phcmembers/directory/categorylistings/index.html.erb
+- app/views/phcmembers/directory/categorylistings/show.html.erb
+- app/views/phcmembers/member/addresses/_form.html.erb
+- app/views/phcmembers/member/addresses/components/_address_address.html.erb
+- app/views/phcmembers/member/addresses/components/_address_audits.html.erb
+- app/views/phcmembers/member/addresses/components/_address_main.html.erb
+- app/views/phcmembers/member/addresses/edit.html.erb
+- app/views/phcmembers/member/addresses/index.html.erb
+- app/views/phcmembers/member/addresses/new.html.erb
+- app/views/phcmembers/member/addresses/show.html.erb
+- app/views/phcmembers/member/listings/_form.html.erb
+- app/views/phcmembers/member/listings/components/_listing_address.html.erb
+- app/views/phcmembers/member/listings/components/_listing_audits.html.erb
+- app/views/phcmembers/member/listings/components/_listing_main.html.erb
+- app/views/phcmembers/member/listings/edit.html.erb
+- app/views/phcmembers/member/listings/index.html.erb
+- app/views/phcmembers/member/listings/new.html.erb
+- app/views/phcmembers/member/listings/show.html.erb
+- app/views/phcmembers/member/profiles/_form.html.erb
+- app/views/phcmembers/member/profiles/components/_profile_main.html.erb
+- app/views/phcmembers/member/profiles/components/_profile_sidebar.html.erb
+- app/views/phcmembers/member/profiles/edit.html.erb
+- app/views/phcmembers/member/profiles/index.html.erb
+- app/views/phcmembers/member/profiles/new.html.erb
+- app/views/phcmembers/member/profiles/show.html.erb
 - config/routes.rb
-- db/migrate/20160706184011_create_phcmembers_members_businesses.rb
-- db/migrate/20160706184249_create_phcmembers_members_contacts.rb
-- db/migrate/20160706184353_create_phcmembers_members_mains.rb
-- db/migrate/20160706184527_create_phcmembers_directory_listings.rb
-- db/migrate/20160706184708_create_phcmembers_directory_categories.rb
 - db/migrate/20160707154842_create_versions.rb
+- db/migrate/20160724220339_create_phcmembers_member_profiles.rb
+- db/migrate/20160725153306_create_phcmembers_member_addresses.rb
+- db/migrate/20160725182257_create_phcmembers_directory_categories.rb
+- db/migrate/20160727024006_create_phcmembers_member_listings.rb
+- db/migrate/20160727042756_create_phcmembers_directory_categorylistings.rb
 - lib/phcmembers.rb
 - lib/phcmembers/engine.rb
 - lib/phcmembers/version.rb

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

@@ -1,71 +0,0 @@
-require_dependency "phcmembers/application_controller"
-
-module Phcmembers
-	class Directory::ListingsController < ApplicationController
-
-		# Filters
-		before_action :set_paper_trail_whodunnit
-		before_action :set_directory_listing, only: [:show, :update, :destroy]
-		# layout 'layouts/phcmemberspro/directory/directory_all.html.erb'
-
-		# Directory Listing Index
-		def index
-			category = Directory::Category.find(params[:category_id])
-			@directory_listings = category.listings
-		end
-
-		# Show Directory Listing
-		def show
-			@versions = PaperTrail::Version.where(item_id: params[:id], item_type: 'Phcmembers::Directory::Listing')
-			category = Directory::Category.find(params[:category_id])
-			@directory_listing = category.listings.find(params[:id])
-		end
-
-		# New Directory Listing
-		def new
-			category = Directory::Category.find(params[:category_id])
-			@directory_listing = category.listings.build
-		end
-
-		# Create Directory Listing Action
-		def create
-			@category = Directory::Category.find(params[:category_id])
-			@directory_listing = @category.listings.create(directory_listing_params)
-			if @directory_listing.save
-				redirect_to directory_category_listings_path, notice: 'Listing was successfully created.'
-				else
-					render :new
-			end
-		end
-
-		# Update Directory Listing Action
-		def update
-			if @directory_listing.update(directory_listing_params)
-				redirect_to directory_category_listings_path, notice: 'Listing was successfully updated.'
-				else
-					render :edit
-			end
-		end
-
-		# Delete Directory Listing
-		def destroy
-			@category = Directory::Category.find(params[:category_id])
-			@directory_listing = @category.listings.find(params[:id])
-			@directory_listing.destroy
-		  redirect_to directory_category_listings_path, notice: 'Listing was successfully destroyed.'
-		end
-
-		private
-		
-		# Common Callbacks
-		def set_directory_listing
-			@directory_listing = Directory::Listing.find(params[:id])
-		end
-
-		# Whitelists
-		def directory_listing_params
-			params.require(:directory_listing).permit(:business_id, :category_id, :main_id)
-		end
-
-	end
-end

data/app/controllers/phcmembers/members/businesses_controller.rb

@@ -1,83 +0,0 @@
-require_dependency "phcmembers/application_controller"
-
-module Phcmembers
-	class Members::BusinessesController < ApplicationController
-
-		# Filters
-		before_action :set_paper_trail_whodunnit
-		before_action :phc_member_mains_info
-		before_action :set_members_business, only: [:edit, :update, :destroy]
-		# layout 'layouts/phcmembers/members/members_all.html.erb'
-
-		# Member Members Business Information Index
-		def index
-			main = Members::Main.find(params[:main_id])
-			@members_businesses = main.businesses.order('mbcompanyname ASC')
-		end
-
-		# Detailed Member Contact Information
-		def show
-			@versions = PaperTrail::Version.where(item_id: params[:id], item_type: 'Phcmembers::Members::Business')
-			main = Members::Main.find(params[:main_id])
-			@members_businesses = main.businesses.find(params[:id])
-		end
-
-		# New Member Members Business Information
-		def new
-			main = Members::Main.find(params[:main_id])
-			@members_business = main.businesses.build
-		end
-
-		# Edit Member Members Business Information
-		def edit
-			main = Members::Main.find(params[:main_id])
-			@members_business = main.businesses.find(params[:id])
-		end
-
-		# Create Action
-		def create
-			@main = Members::Main.find(params[:main_id])
-			@members_business = @main.businesses.create(members_business_params)
-			if @members_business.save
-				redirect_to members_main_businesses_path, notice: 'Members Business was successfully created.'
-				else
-					render :new
-			end
-		end
-
-		# Update Action
-		def update
-			if @members_business.update(members_business_params)
-				redirect_to members_main_businesses_path, notice: 'Members Business Information was successfully updated.'
-				else
-					render :edit
-			end
-		end
-
-		# Delete Action
-		def destroy
-			@main = Members::Main.find(params[:main_id])
-			@members_business = @main.businesses.find(params[:id])
-			@members_business.destroy
-				redirect_to members_main_businesses_path, notice: 'Members Business has been Deleted.'
-		end
-
-		private
-		
-		# Grab Member Information
-		def phc_member_mains_info  
-			@members_main = Members::Main.find(params[:main_id])
-		end
-
-		# Common Callbacks
-		def set_members_business
-			@members_business = Members::Business.find(params[:id])
-		end
-
-		# White List
-		def members_business_params
-			params.require(:members_business).permit(:mbcompanyname, :mbcontactname, :mbaddressl1, :mbaddressl2, :mbcity, :mbcountry, :mbprovince, :mbpostalcode, :mbphone, :mbcontactemail, :mbwebsite, :main_id)
-		end
-
-	end
-end