dhatu 0.1.19 → 0.1.20

data/app/views/dhatu/testimonials/index.html.erb

@@ -3,14 +3,6 @@
   <div class="col-md-12">
     
     <ul class="nav nav-tabs nav-tabs-justified">
-      <% Dhatu::Testimonial::STATUS.each do |key, value| %>
-      <li class="<%= @status == value ? 'active' : '' %>">
-        <%= link_to testimonials_path(st: value), "aria-expanded" => "#{ @status == value ? 'true' : 'false' }" do %>
-          <span class="visible-xs"><i class="fa-gift"></i></span>
-          <span class="hidden-xs"><%= key %></span>
-        <% end %>
-      </li>
-      <% end %>
     </ul>
 
     <div class="tab-content">
@@ -28,6 +20,19 @@
               <%= search_form_kuppayam(Dhatu::Offer, testimonials_path(st: @status), text: @filters[:query]) %>
             </div>
           </div>
+          <div class="row">
+            <div class="col-md-12 visible-sm visible-xs mt-10">
+            </div>
+            <div class="col-md-12">
+              <% @filter_ui_settings.each do |filter_name, options| %>
+                <% if options[:object_filter] == true %>
+                  <%= report_object_filter(filter_name, options) %>
+                <% else %>
+                  <%= report_filter(filter_name, options) %>
+                <% end %>
+              <% end %>
+            </div>
+          </div>
 
         </div>
         <%= clear_tag(10) %>

data/app/views/layouts/kuppayam/_sidebar.html.erb

@@ -1,15 +1,15 @@
 <%
-	dhatu_items = {
-		sections: {
-			text: "Sections",
-			icon_class: "fa-reorder",
-			url: dhatu.sections_url,
-			has_permission: @current_user.has_read_permission?(Dhatu::Section)
+	dhatu_website_items = {
+		pages: {
+			text: "Pages",
+			icon_class: "fa-file",
+			url: dhatu.pages_url,
+			has_permission: @current_user.has_read_permission?(Dhatu::Page)
 		},
 		categories: {
 			text: "Categories",
 			icon_class: "fa-sitemap",
-			url: dhatu.categories_url,
+			url: dhatu.choose_category_type_url,
 			has_permission: @current_user.has_read_permission?(Dhatu::Category)
 		},
 		projects: {
@@ -24,30 +24,6 @@
 			url: dhatu.services_url,
 			has_permission: @current_user.has_read_permission?(Dhatu::Service)
 		},
-		promotions: {
-			text: "Promotions",
-			icon_class: "fa-gift",
-			url: dhatu.promotions_url,
-			has_permission: @current_user.has_read_permission?(Dhatu::Promotion)
-		},
-		promotion_enquiries: {
-			text: "Promotional Enquiries",
-			icon_class: "linecons-sound",
-			url: dhatu.promotion_enquiries_url,
-			has_permission: @current_user.has_read_permission?(Dhatu::PromotionEnquiry)
-		},
-		bookings: {
-			text: "Bookings",
-			icon_class: "fa-calendar",
-			url: dhatu.bookings_url,
-			has_permission: @current_user.has_read_permission?(Dhatu::Booking)
-		},
-		blog_posts: {
-			text: "Blog",
-			icon_class: "fa-newspaper-o",
-			url: dhatu.blog_posts_url,
-			has_permission: @current_user.has_read_permission?(Dhatu::BlogPost)
-		},
 		prices: {
 			text: "Prices",
 			icon_class: "fa-dollar",
@@ -60,12 +36,6 @@
 			url: dhatu.branches_url,
 			has_permission: @current_user.has_read_permission?(Dhatu::Branch)
 		},
-		offers: {
-			text: "Offers",
-			icon_class: "fa-gift",
-			url: dhatu.offers_url,
-			has_permission: @current_user.has_read_permission?(Dhatu::Offer)
-		},
 		events: {
 			text: "Events",
 			icon_class: "fa-calendar",
@@ -86,6 +56,40 @@
 		}
 	}
 %>
+<%
+	dhatu_marketing_items = {
+		promotions: {
+			text: "Promotions",
+			icon_class: "fa-gift",
+			url: dhatu.promotions_url,
+			has_permission: @current_user.has_read_permission?(Dhatu::Promotion)
+		},
+		promotion_enquiries: {
+			text: "Promotional Enquiries",
+			icon_class: "linecons-sound",
+			url: dhatu.promotion_enquiries_url,
+			has_permission: @current_user.has_read_permission?(Dhatu::PromotionEnquiry)
+		},
+		bookings: {
+			text: "Bookings",
+			icon_class: "fa-calendar",
+			url: dhatu.bookings_url,
+			has_permission: @current_user.has_read_permission?(Dhatu::Booking)
+		},
+		blog_posts: {
+			text: "Blog",
+			icon_class: "fa-newspaper-o",
+			url: dhatu.blog_posts_url,
+			has_permission: @current_user.has_read_permission?(Dhatu::BlogPost)
+		},
+		offers: {
+			text: "Offers",
+			icon_class: "fa-gift",
+			url: dhatu.offers_url,
+			has_permission: @current_user.has_read_permission?(Dhatu::Offer)
+		}
+	}
+%>
 <%
 	user_items = {
 		users: {
@@ -121,12 +125,6 @@
 			icon_class: "linecons-diamond",
 			url: usman.features_url,
 			has_permission: @current_user.has_read_permission?(Feature)
-		},
-		section_types: {
-			text: "Manage Section Types",
-			icon_class: "fa-reorder",
-			url: dhatu.section_types_url,
-			has_permission: @current_user.has_read_permission?(Dhatu::SectionType)
 		}
 	}
 %>
@@ -154,7 +152,7 @@
 	}
 %>
 
-<div class="sidebar-menu toggle-others fixed">
+<div class="sidebar-menu toggle-others collapsed">
 	
 	<div class="sidebar-menu-inner">
 		
@@ -191,14 +189,31 @@
 				</li>
 			<% end %>
 
-			<% if dhatu_items.map{|x,y| x if y[:has_permission] }.compact.any? %>
+			<% if dhatu_website_items.map{|x,y| x if y[:has_permission] }.compact.any? %>
 			<li class="">
 				<a href="#">
 					<i class="fa-trello"></i>
-					<span class="title">Manage Contents</span>
+					<span class="title">Website Elements</span>
+				</a>
+				<ul>
+					<% dhatu_website_items.each do |key, values| %>
+					<% next unless values[:has_permission] %>
+					<li class="">
+						<%= link_to raw("<i class=\"#{values[:icon_class]}\"></i> <span class='title'>#{values[:text]}</span>"), values[:url] %>
+					</li>
+					<% end %>
+				</ul>
+			</li>
+			<% end %>
+
+			<% if dhatu_marketing_items.map{|x,y| x if y[:has_permission] }.compact.any? %>
+			<li class="">
+				<a href="#">
+					<i class="fa-money"></i>
+					<span class="title">Marketing Elements</span>
 				</a>
 				<ul>
-					<% dhatu_items.each do |key, values| %>
+					<% dhatu_marketing_items.each do |key, values| %>
 					<% next unless values[:has_permission] %>
 					<li class="">
 						<%= link_to raw("<i class=\"#{values[:icon_class]}\"></i> <span class='title'>#{values[:text]}</span>"), values[:url] %>
@@ -229,7 +244,7 @@
 			<li class="">
 				<a href="#">
 					<i class="linecons-params"></i>
-					<span class="title">Configure</span>
+					<span class="title">Configurations</span>
 				</a>
 				<ul>
 					<% configuration_items.each do |key, values| %>

data/app/views/usman/dashboard/_super_admin_index.html.erb

@@ -0,0 +1,22 @@
+<%
+	super_admin_items = {
+		features: {
+			text: "Features",
+			icon_class: "linecons-diamond",
+			url: usman.features_url,
+			has_permission: @current_user.has_read_permission?(Feature)
+		}
+	}
+%>
+
+<% if (super_admin_items.map{|x, y| y[:has_permission] }).compact.uniq.any? %>
+
+<h3 class="text-gray mt-50 mb-10">
+	Configurations <br>
+	<small class="text-muted">Configure Features & Other Settings </small>
+</h3>
+<hr class="mb-30" style="border-top:1px solid #ddd;">
+
+<%= render partial: "/layouts/dashboard/items", locals: { items: super_admin_items } %>
+
+<% end %>

data/config/routes.rb

@@ -68,7 +68,17 @@ Dhatu::Engine.routes.draw do
 			end
 		end
 
-		resources :section_types
+		resources :pages do
+			member do
+				put :update_status, as:  :update_status
+			end
+		end
+
+		resources :meta_tags do
+			member do
+				put :update_status, as:  :update_status
+			end
+		end
 
 		resources :sections do
 			member do
@@ -116,6 +126,7 @@ Dhatu::Engine.routes.draw do
 			end
 		end
 
+		get '/categories/choose_category_type', :controller => "categories", action: :choose_category_type, as:  :choose_category_type
 		resources :categories do
       member do
         put :make_parent, as:  :make_parent

data/db/data/dummy/services.csv

@@ -1,4 +1,4 @@
-name, meta_description, description, price, duration, category, status, featured, priority
+name, short_description, description, price, duration, category, status, featured, priority
 Hair coloring,Hair coloring,"Red Velvet hair salon specializes in diverse hair coloring styles. The design of our salon setting is in such a way that you will relax the whole good time as we work our magic on your hair. We guarantee that you will love the results and probably keep coming back for more. There are many standard hair coloring packages out there, but none can beat our advanced and specialized packages.",,,Hair,published,false,1
 Balayage hair coloring technique,Balayage hair coloring technique,"Balayage means sweeping or painting in the French language. Believe you me; the effect of balayage hair coloring is outstanding. Our coloring specialists brush the hair with a color of your choice on the surface of the hair without saturating the whole section with hair dye. The result is soft hair that is equally blended and attractive to the eye.",,,Hair,published,false,1
 The ombre option,The ombre option,"The beauty of ombre hair coloring is that it will never go out of fashion. As such our dedicated team at Red Velvet salon will work round the clock to bring this perfect finishing to your hair. Book an appointment with us, and you will be amazed at the beauty that ombre coloring will bring on board. Ombre hair coloring uses a unique technique to ensure that the hair ends are lighter in color than the rest of the hair. Supposing that your hair is not dark, well our staff would advise that you consider deepening your natural hair shade to something different.",,,Hair,published,false,1

data/db/migrate/20180101093435_create_pages.rb

@@ -0,0 +1,14 @@
+class CreatePages < ActiveRecord::Migration[5.1]
+  def change
+    create_table :pages do |t|
+      t.string :name, :null => false, limit: 64
+      t.string :code, :null => false, limit: 64
+      t.references :feature
+      t.string :status, :null => false, :default=>"unpublished", :limit=>16
+      t.timestamps null: false
+    end
+
+    add_index :pages, :code, :unique => true
+    add_index :pages, :status
+  end
+end

data/db/migrate/20180101093436_create_meta_tags.rb

@@ -0,0 +1,19 @@
+class CreateMetaTags < ActiveRecord::Migration[5.1]
+  def change
+    create_table :meta_tags do |t|
+      t.integer :meta_taggable_id
+      t.string :meta_taggable_type
+
+      # Type Can be Basic HTML, Open Graph, Twitter Card, Others
+      t.string :meta_type, :null => false, limit: 16
+
+      t.string :meta_key, :null => false, limit: 128
+      t.string :meta_value, :null => true, limit: 1024
+
+      t.string :status, :null => false, :default=>"unpublished", :limit=>16
+      t.timestamps null: false
+    end
+    add_index :meta_tags, :status
+    add_index(:meta_tags, [ :meta_taggable_id, :meta_taggable_type ])
+  end
+end

data/db/migrate/20180101093437_add_page_id_to_sections.rb

@@ -0,0 +1,5 @@
+class AddPageIdToSections < ActiveRecord::Migration[5.1]
+  def change
+  	add_reference :sections, :page, index: true
+  end
+end

data/db/migrate/20180101093438_add_priority_to_pages_and_sections.rb

@@ -0,0 +1,6 @@
+class AddPriorityToPagesAndSections < ActiveRecord::Migration[5.1]
+  def change
+  	add_column :pages, :priority, :integer, default: 1000
+  	add_column :sections, :priority, :integer, default: 1000
+  end
+end

data/db/migrate/20180101093439_add_a_ton_of_boolean_fields_to_sections.rb

@@ -0,0 +1,34 @@
+class AddATonOfBooleanFieldsToSections < ActiveRecord::Migration[5.1]
+  def change
+  	add_column :sections, :enable_title, :boolean, default: false
+  	add_column :sections, :enable_sub_title, :boolean, default: false
+  	add_column :sections, :enable_short_description, :boolean, default: false
+  	add_column :sections, :enable_long_description, :boolean, default: false
+  	add_column :sections, :enable_button_one, :boolean, default: false
+  	add_column :sections, :enable_button_two, :boolean, default: false
+  	add_column :sections, :enable_cover_image, :boolean, default: false
+  	add_column :sections, :enable_gallery_images, :boolean, default: false
+
+    begin
+    	Dhatu::Section.all.each do |section|
+    		section.enable_title = !section.title.blank?
+    		section.enable_sub_title = !section.sub_title.blank?
+    		section.enable_short_description = !section.short_description.blank?
+    		section.enable_long_description = !section.long_description.blank?
+    		section.enable_button_one = !section.button_one_text.blank?
+    		section.enable_button_two = !section.button_two_text.blank?
+    		section.enable_cover_image = !section.cover_image.blank?
+    		section.enable_gallery_images = section.gallery_images.any?
+    		section.save
+    	end
+    rescue
+      puts ""
+      puts ""
+      puts ""
+      puts "ERROR in AddATonOfBooleanFieldsToSections".red
+      puts ""
+      puts ""
+      puts ""
+    end
+  end
+end

data/db/migrate/20180101093440_add_code_to_sections.rb

@@ -0,0 +1,19 @@
+class AddCodeToSections < ActiveRecord::Migration[5.1]
+  def change
+  	add_column :sections, :code, :string, null: false, limit: 64
+  	begin
+	  	Dhatu::Section.all.each do |section|
+	      section.code = section.section_type.code if section.section_type
+	      section.save
+	    end
+    rescue
+	  	puts ""
+	  	puts ""
+	  	puts ""
+	  	puts "ERROR in AddCodeToSections".red
+	  	puts ""
+	  	puts ""
+	  	puts ""
+	  end
+  end
+end

data/db/migrate/20180101093441_rename_meta_description_all_over.rb

@@ -0,0 +1,7 @@
+class RenameMetaDescriptionAllOver < ActiveRecord::Migration[5.1]
+  def change
+  	rename_column :projects, :meta_description, :short_description
+  	rename_column :services, :meta_description, :short_description
+  	rename_column :blog_posts, :meta_description, :short_description
+  end
+end

data/db/migrate/20180101093442_add_name_to_sections.rb

@@ -0,0 +1,19 @@
+class AddNameToSections < ActiveRecord::Migration[5.1]
+  def change
+  	add_column :sections, :name, :string, null: false, limit: 64
+  	begin
+	  	Dhatu::Section.all.each do |section|
+	      section.name = section.code.titleize.gsub("_", " ") if section.code
+	      section.save
+	    end
+	  rescue
+	  	puts ""
+	  	puts ""
+	  	puts ""
+	  	puts "ERROR in AddNameToSections".red
+	  	puts ""
+	  	puts ""
+	  	puts ""
+	  end
+  end
+end

data/lib/dhatu/version.rb

@@ -1,3 +1,3 @@
 module Dhatu
-  VERSION = '0.1.19'
+  VERSION = '0.1.20'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dhatu
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.20
 platform: ruby
 authors:
 - kpvarma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-02 00:00:00.000000000 Z
+date: 2018-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -107,7 +107,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.32
+        version: 0.1.35
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -117,7 +117,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.32
+        version: 0.1.35
 - !ruby/object:Gem::Dependency
   name: pattana
   requirement: !ruby/object:Gem::Requirement
@@ -127,7 +127,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.22
+        version: 0.1.23
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -137,7 +137,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.22
+        version: 0.1.23
 - !ruby/object:Gem::Dependency
   name: usman
   requirement: !ruby/object:Gem::Requirement
@@ -147,7 +147,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.33
+        version: 0.3.34
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -157,7 +157,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.33
+        version: 0.3.34
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
@@ -416,7 +416,9 @@ files:
 - app/controllers/dhatu/categories_controller.rb
 - app/controllers/dhatu/dashboard_controller.rb
 - app/controllers/dhatu/events_controller.rb
+- app/controllers/dhatu/meta_tags_controller.rb
 - app/controllers/dhatu/offers_controller.rb
+- app/controllers/dhatu/pages_controller.rb
 - app/controllers/dhatu/prices_controller.rb
 - app/controllers/dhatu/projects_controller.rb
 - app/controllers/dhatu/promotion_attributes_controller.rb
@@ -437,7 +439,9 @@ files:
 - app/models/dhatu/branch.rb
 - app/models/dhatu/category.rb
 - app/models/dhatu/event.rb
+- app/models/dhatu/meta_tag.rb
 - app/models/dhatu/offer.rb
+- app/models/dhatu/page.rb
 - app/models/dhatu/price.rb
 - app/models/dhatu/project.rb
 - app/models/dhatu/promotion.rb
@@ -449,7 +453,9 @@ files:
 - app/models/dhatu/team_member.rb
 - app/models/dhatu/testimonial.rb
 - app/models/image/category_image.rb
+- app/models/image/og_image.rb
 - app/uploaders/category_image_uploader.rb
+- app/uploaders/og_image_uploader.rb
 - app/views/dhatu/blog_posts/_form.html.erb
 - app/views/dhatu/blog_posts/_index.html.erb
 - app/views/dhatu/blog_posts/_row.html.erb
@@ -465,10 +471,14 @@ files:
 - app/views/dhatu/branches/_row.html.erb
 - app/views/dhatu/branches/_show.html.erb
 - app/views/dhatu/branches/index.html.erb
+- app/views/dhatu/categories/_category_types.html.erb
 - app/views/dhatu/categories/_form.html.erb
 - app/views/dhatu/categories/_index.html.erb
+- app/views/dhatu/categories/_index_list.html.erb
 - app/views/dhatu/categories/_row.html.erb
+- app/views/dhatu/categories/_row_list.html.erb
 - app/views/dhatu/categories/_show.html.erb
+- app/views/dhatu/categories/choose_category_type.html.erb
 - app/views/dhatu/categories/index.html.erb
 - app/views/dhatu/dashboard/_index.html.erb
 - app/views/dhatu/dashboard/index.html.erb
@@ -477,11 +487,21 @@ files:
 - app/views/dhatu/events/_row.html.erb
 - app/views/dhatu/events/_show.html.erb
 - app/views/dhatu/events/index.html.erb
+- app/views/dhatu/meta_tags/_form.html.erb
+- app/views/dhatu/meta_tags/_index.html.erb
+- app/views/dhatu/meta_tags/_row.html.erb
+- app/views/dhatu/meta_tags/create.js.erb
 - app/views/dhatu/offers/_form.html.erb
 - app/views/dhatu/offers/_index.html.erb
 - app/views/dhatu/offers/_row.html.erb
 - app/views/dhatu/offers/_show.html.erb
 - app/views/dhatu/offers/index.html.erb
+- app/views/dhatu/pages/_form.html.erb
+- app/views/dhatu/pages/_index.html.erb
+- app/views/dhatu/pages/_row.html.erb
+- app/views/dhatu/pages/_show.html.erb
+- app/views/dhatu/pages/index.html.erb
+- app/views/dhatu/pages/show.html.erb
 - app/views/dhatu/prices/_form.html.erb
 - app/views/dhatu/prices/_index.html.erb
 - app/views/dhatu/prices/_row.html.erb
@@ -492,6 +512,7 @@ files:
 - app/views/dhatu/projects/_row.html.erb
 - app/views/dhatu/projects/_show.html.erb
 - app/views/dhatu/projects/index.html.erb
+- app/views/dhatu/projects/show.html.erb
 - app/views/dhatu/promotion_attributes/_form.html.erb
 - app/views/dhatu/promotion_attributes/_index.html.erb
 - app/views/dhatu/promotion_attributes/_row.html.erb
@@ -507,11 +528,11 @@ files:
 - app/views/dhatu/promotions/_row.html.erb
 - app/views/dhatu/promotions/_show.html.erb
 - app/views/dhatu/promotions/index.html.erb
-- app/views/dhatu/section_types/_form.html.erb
-- app/views/dhatu/section_types/_index.html.erb
-- app/views/dhatu/section_types/_row.html.erb
-- app/views/dhatu/section_types/_show.html.erb
-- app/views/dhatu/section_types/index.html.erb
+- app/views/dhatu/section_types1/_form.html.erb
+- app/views/dhatu/section_types1/_index.html.erb
+- app/views/dhatu/section_types1/_row.html.erb
+- app/views/dhatu/section_types1/_show.html.erb
+- app/views/dhatu/section_types1/index.html.erb
 - app/views/dhatu/sections/_form.html.erb
 - app/views/dhatu/sections/_index.html.erb
 - app/views/dhatu/sections/_row.html.erb
@@ -538,6 +559,7 @@ files:
 - app/views/layouts/kuppayam/_navbar.html.erb
 - app/views/layouts/kuppayam/_sidebar.html.erb
 - app/views/pattana/dashboard/_index.html.erb
+- app/views/usman/dashboard/_super_admin_index.html.erb
 - config/routes.rb
 - db/data/dummy/categories.csv
 - db/data/dummy/events.csv
@@ -572,9 +594,16 @@ files:
 - db/migrate/20171120145547_add_section_type_id_to_sections.rb
 - db/migrate/20171120145548_create_promotion_and_promotion_enquiries.rb
 - db/migrate/20171203114528_change_default_status_of_promotion_enquiries.rb
-- db/migrate/20171203114529_add_meta_description_to_services.rb
 - db/migrate/20171203114530_add_control_fields_to_promotions.rb
 - db/migrate/20180101093434_create_projects.rb
+- db/migrate/20180101093435_create_pages.rb
+- db/migrate/20180101093436_create_meta_tags.rb
+- db/migrate/20180101093437_add_page_id_to_sections.rb
+- db/migrate/20180101093438_add_priority_to_pages_and_sections.rb
+- db/migrate/20180101093439_add_a_ton_of_boolean_fields_to_sections.rb
+- db/migrate/20180101093440_add_code_to_sections.rb
+- db/migrate/20180101093441_rename_meta_description_all_over.rb
+- db/migrate/20180101093442_add_name_to_sections.rb
 - lib/dhatu.rb
 - lib/dhatu/engine.rb
 - lib/dhatu/factories.rb