dhatu 0.1.25 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b61caa08b4a5e9f6f3272d1e7dac508637c2fa9bb4838f841170c37d92a24e90
-  data.tar.gz: 2e698dc5e1ab1f22f33944d75b32e16c0e461935103812c1381a27ca208c3c6c
+  metadata.gz: d86a2db6606d13b0c37c9761e6f24e14f9ce940c7521c640d1e043a31f207967
+  data.tar.gz: f6f8cb4ba9b26c523fb2226c1af5e53da3338afa9a4888105dc7e61f32d6889b
 SHA512:
-  metadata.gz: 2c7cdd79de757fe642af93110d8b51e3f44699d9611626acfca4795ba5c29459255a157c10ff28fe50d93ec1fda7a366c302a91bb3d380c9a542130d81dbfed2
-  data.tar.gz: 4e1877734b8ea00939622e272744850620cc6bc5e87f0ee81071fb71cfd222a05bc454aba575416efee70c91ddd78df0988b4fdafb0bdfa5f93d86a2206e150e
+  metadata.gz: e5317626fb1813fe528a7f17006f883b4c1bc3ef371139afbfc6d68fee1b213d7634d28fadb590f06e00951c4037e4709184b1b35f9c5f2c3f4b8644623893b7
+  data.tar.gz: d4c53785c6fe128b9f825231d7d034959b506144b3befb370a4752fa0e5be1372f4fdadc97323703dddaba7db152fba54da75ddf59775ef6563b6a5e1dcd35e3

data/app/models/dhatu/page.rb

@@ -24,6 +24,38 @@ class Dhatu::Page < Dhatu::ApplicationRecord
 
   scope :search, lambda { |query| where("LOWER(name) LIKE LOWER('%#{query}%') OR LOWER(code) LIKE LOWER('%#{query}%')") }
 
+  def self.save_row_data(hsh)
+    # Initializing error hash for displaying all errors altogether
+    error_object = Kuppayam::Importer::ErrorHash.new
+
+    return error_object if hsh[:code].to_s.strip.blank?
+
+    page = Dhatu::Page.where("code = ?", hsh[:code].to_s.strip).first || Dhatu::Page.new
+
+    page.name = hsh[:name].to_s.strip
+    page.code = hsh[:code].to_s.strip
+
+    page.feature = Feature.where("name = ?", hsh[:feature].to_s.strip).first
+
+    page.status = hsh[:status].to_s.strip || PUBLISHED
+    page.priority = hsh[:priority].to_s.strip || 1
+
+    if page.valid?
+      begin
+        page.save!
+      rescue Exception => e
+        summary = "uncaught #{e} exception while handling connection: #{e.message}"
+        details = "Stack trace: #{e.backtrace.map {|l| "  #{l}\n"}.join}"
+        error_object.errors << { summary: summary, details: details }        
+      end
+    else
+      summary = "Error while saving page: #{page.title}"
+      details = "Error! #{page.errors.full_messages.to_sentence}"
+      error_object.errors << { summary: summary, details: details }
+    end
+    return error_object
+  end
+
   # ------------------
   # Instance Methods
   # ------------------

data/app/models/dhatu/section.rb

@@ -19,7 +19,6 @@ class Dhatu::Section < Dhatu::ApplicationRecord
   validates :button_two_link, length: {maximum: 512}, allow_blank: true
 
   # Associations
-  belongs_to :section_type, :class_name => "Dhatu::SectionType", optional: true
   belongs_to :page, :class_name => "Dhatu::Page", optional: true
   has_one :cover_image, :as => :imageable, :dependent => :destroy, :class_name => "Image::CoverImage"
   has_many :gallery_images, :as => :imageable, :dependent => :destroy, :class_name => "Image::GalleryImage"
@@ -48,18 +47,25 @@ class Dhatu::Section < Dhatu::ApplicationRecord
     return error_object if hsh[:code].to_s.strip.blank?
 
     section = Dhatu::Section.where("code = ?", hsh[:code].to_s.strip).first || Dhatu::Section.new
-    
-    section.title = hsh[:title].to_s.strip
+
+    section.name = hsh[:name].to_s.strip
     section.code = hsh[:code].to_s.strip
+
+    section.title = hsh[:title].to_s.strip
     section.sub_title = hsh[:sub_title].to_s.strip
+
     section.short_description = hsh[:short_description].to_s.strip
     section.long_description = hsh[:long_description].to_s.strip
+
     section.button_one_text = hsh[:button_one_text].to_s.strip
     section.button_two_text = hsh[:button_two_text].to_s.strip
     section.button_one_link = hsh[:button_one_link].to_s.strip
     section.button_two_link = hsh[:button_two_link].to_s.strip
 
+    section.page = Dhatu::Page.where("code = ?", hsh[:page].to_s.strip).first
+
     section.status = hsh[:status].to_s.strip || PUBLISHED
+    section.priority = hsh[:priority].to_s.strip || 1
 
     if section.valid?
       begin

data/app/models/dhatu/testimonial.rb

@@ -39,7 +39,7 @@ class Dhatu::Testimonial < Dhatu::ApplicationRecord
     testimonial.name = hsh[:name].to_s.strip
     testimonial.designation = hsh[:designation].to_s.strip
     testimonial.organisation = hsh[:organisation].to_s.strip
-    testimonial.description = hsh[:description].to_s.strip
+    testimonial.statement = hsh[:statement].to_s.strip
     
     # testimonial.category = Dhatu::Category.find_by_name(hsh[:category])
     testimonial.status = hsh[:status].to_s.strip || PUBLISHED

data/db/data/dummy/pages.csv

@@ -0,0 +1,10 @@
+name, code,status,priority,feature
+Home Page,HOME_PAGE,published,1,
+About Us Page,ABOUT_US_PAGE,published,2,
+Contact Us Page,CONTACT_US_PAGE,published,3,
+Products Page,PRODUCTS_PAGE,published,4,Dhatu::Product
+Services Page,SERVICES_PAGE,published,5,Dhatu::Service
+Projects Page,PROJECTS_PAGE,published,6,Dhatu::Project
+Offers Page,OFFERS_PAGE,unpublished,7,Dhatu::Offer
+Prices Page,PRICES_PAGE,unpublished,8,Dhatu::Price
+Blogs Page,BLOGS_PAGE,unpublished,9,Dhatu::BlogPost

data/db/data/dummy/sections.csv

@@ -1,15 +1,15 @@
- section_type,title, status, sub_title, short_description, long_description, button_one_text, button_two_text, button_one_link, button_two_link
-ABOUT_US_BANNER,About Us,published,We are Awesome!,,,,,,
-CONTACT_US_BANNER,Contact Us,published,Drop us a message to let us know how we can help you,,,,,,
-BLOG_BANNER,Going Places,published,"I havent been everywhere, but its on my list",,,,,,
-OFFERS_BANNER,Limitted Offers,published,Grab your offer right not!,,,,,,
-SERVICES_BANNER,Our Services,published,Serving better day by day,,,,,,
-PRODUCTS_BANNER,Our Products,published,Click on the links left to filter down,,,,,,
-PROJECTS_BANNER,Recent Projects,published,Take a look at some of the great projects we have done recently.,,,,,,
-HOME_PAGE_SLIDE,Aspire to inspire before we expire,published,"A good teacher can inspire hope, ignite the imagination, and instill a love of learning. Read more at: https://www.brainyquote.com/topics/inspire",,,,,,
-HOME_PAGE_SLIDE,7 Billion Smiles and yours is my favorite,published,The most important thing is to try and inspire people so that they can be great in whatever they want to do. Read more at: https://www.brainyquote.com/topics/inspire,,,,,,
-HOME_PAGE_SLIDE,Create your own Sunshine,published,Find your voice and inspire others to find theirs. Read more at: https://www.brainyquote.com/topics/inspire,,,,,,
-BOOK_NOW,Download Free Sample,published,Fill up this form to get your free copy of the e-book - Himalayan Mistics,,,,,,
-ABOUT_US,About Us,published,About Us Section,,,,,,
-CONTACT_US,Contact Us,published,Contact Us Section,,,,,,
-ABOUT_US_FOOTER,About Us,published,,ellow Leaf Hammocks is a company trying to save the world via hammocks. The brand plans to accomplish this by selling hand-woven hammocks from artisans in Thailand.,,,,,
+Name, code, status,priority,title, sub_title, short_description, long_description, button_one_text, button_two_text, button_one_link, button_two_link
+About Us Section,ABOUT_US_BANNER,published,1,About Us,We are Awesome!,,,,,,
+Contact Us Section,CONTACT_US_BANNER,published,2,Contact Us,Drop us a message to let us know how we can help you,,,,,,
+BLOG_BANNER,BLOG_BANNER,published,3,Going Places,"I havent been everywhere, but its on my list",,,,,,
+OFFERS_BANNER,OFFERS_BANNER,published,4,Limitted Offers,Grab your offer right not!,,,,,,
+SERVICES_BANNER,SERVICES_BANNER,published,5,Our Services,Serving better day by day,,,,,,
+PRODUCTS_BANNER,PRODUCTS_BANNER,published,6,Our Products,Click on the links left to filter down,,,,,,
+PROJECTS_BANNER,PROJECTS_BANNER,published,7,Recent Projects,Take a look at some of the great projects we have done recently.,,,,,,
+HOME_PAGE_SLIDE,HOME_PAGE_SLIDE,published,8,Aspire to inspire before we expire,"A good teacher can inspire hope, ignite the imagination, and instill a love of learning. Read more at: https://www.brainyquote.com/topics/inspire",,,,,,
+HOME_PAGE_SLIDE,HOME_PAGE_SLIDE,published,9,7 Billion Smiles and yours is my favorite,The most important thing is to try and inspire people so that they can be great in whatever they want to do. Read more at: https://www.brainyquote.com/topics/inspire,,,,,,
+HOME_PAGE_SLIDE,HOME_PAGE_SLIDE,published,10,Create your own Sunshine,Find your voice and inspire others to find theirs. Read more at: https://www.brainyquote.com/topics/inspire,,,,,,
+BOOK_NOW,BOOK_NOW,published,11,Download Free Sample,Fill up this form to get your free copy of the e-book - Himalayan Mistics,,,,,,
+ABOUT_US,ABOUT_US,published,12,About Us,About Us Section,,,,,,
+CONTACT_US,CONTACT_US,published,13,Contact Us,Contact Us Section,,,,,,
+ABOUT_US_FOOTER,ABOUT_US_FOOTER,published,14,About Us,,ellow Leaf Hammocks is a company trying to save the world via hammocks. The brand plans to accomplish this by selling hand-woven hammocks from artisans in Thailand.,,,,,

data/db/data/pages.csv

@@ -0,0 +1,10 @@
+name, code,status,priority,feature
+Home Page,HOME_PAGE,published,1,
+About Us Page,ABOUT_US_PAGE,published,2,
+Contact Us Page,CONTACT_US_PAGE,published,3,
+Products Page,PRODUCTS_PAGE,published,4,Dhatu::Product
+Services Page,SERVICES_PAGE,published,5,Dhatu::Service
+Projects Page,PROJECTS_PAGE,published,6,Dhatu::Project
+Offers Page,OFFERS_PAGE,unpublished,7,Dhatu::Offer
+Prices Page,PRICES_PAGE,unpublished,8,Dhatu::Price
+Blogs Page,BLOGS_PAGE,unpublished,9,Dhatu::BlogPost

data/db/data/permissions.csv

@@ -2,7 +2,6 @@ user,feature,can_create,can_read,can_update,can_delete
 john.honai,Dhatu::Price,TRUE,TRUE,TRUE,TRUE
 john.honai,Dhatu::Category,TRUE,TRUE,TRUE,TRUE
 john.honai,Dhatu::Section,TRUE,TRUE,TRUE,TRUE
-john.honai,Dhatu::SectionType,TRUE,TRUE,TRUE,FALSE
 john.honai,Dhatu::Branch,TRUE,TRUE,TRUE,TRUE
 john.honai,Dhatu::BlogPost,TRUE,TRUE,TRUE,TRUE
 john.honai,Dhatu::Booking,TRUE,TRUE,TRUE,TRUE
@@ -13,7 +12,6 @@ john.honai,Permission,TRUE,TRUE,TRUE,FALSE
 malavika,Dhatu::Price,TRUE,TRUE,TRUE,TRUE
 malavika,Dhatu::Category,TRUE,TRUE,TRUE,TRUE
 malavika,Dhatu::Section,TRUE,TRUE,TRUE,TRUE
-malavika,Dhatu::SectionType,TRUE,TRUE,TRUE,FALSE
 malavika,Dhatu::Branch,TRUE,TRUE,TRUE,TRUE
 malavika,Dhatu::BlogPost,TRUE,TRUE,TRUE,TRUE
 malavika,Dhatu::Booking,TRUE,TRUE,TRUE,TRUE
@@ -24,7 +22,6 @@ malavika,Permission,TRUE,TRUE,TRUE,FALSE
 anas,Dhatu::Price,TRUE,TRUE,TRUE,TRUE
 anas,Dhatu::Category,TRUE,TRUE,TRUE,TRUE
 anas,Dhatu::Section,TRUE,TRUE,TRUE,TRUE
-anas,Dhatu::SectionType,TRUE,TRUE,TRUE,FALSE
 anas,Dhatu::Branch,TRUE,TRUE,TRUE,TRUE
 anas,Dhatu::BlogPost,TRUE,TRUE,TRUE,TRUE
 anas,Dhatu::Booking,TRUE,TRUE,TRUE,TRUE

data/db/master_data/features.csv

@@ -8,7 +8,6 @@ Region,published,FALSE,1
 City,published,FALSE,1
 Locality,published,FALSE,1
 Dhatu::Section,published,FALSE,1
-Dhatu::SectionType,published,FALSE,1
 Dhatu::BlogPost,published,TRUE,1
 Dhatu::Branch,published,FALSE,1
 Dhatu::Offer,published,FALSE,1

data/db/migrate/20160803045832_create_events.rb

@@ -10,9 +10,12 @@ class CreateEvents < ActiveRecord::Migration[5.0]
       t.date     :date, :null => true
       t.datetime :starts_at, :null => true
       t.datetime :ends_at, :null => true
+
+      t.references :category, index: true
       
       t.boolean :featured, default: false
       t.string :status, :null => false, :default=>"unpublished", :limit=>16
+      t.integer :priority, default: 1, null: false
 
       t.timestamps null: false
     end

data/db/migrate/20160803045832_create_offers.rb

@@ -9,9 +9,12 @@ class CreateOffers < ActiveRecord::Migration[5.0]
       
       t.datetime :starts_at, :null => true
       t.datetime :ends_at, :null => true
+
+      t.references :category, index: true
       
       t.boolean :featured, default: false
       t.string :status, :null => false, :default=>"unpublished", :limit=>16
+      t.integer :priority, default: 1, null: false
 
       t.timestamps null: false
     end

data/db/migrate/{20180101093435_create_pages.rb → 20171010055101_create_pages.rb}

@@ -3,8 +3,12 @@ class CreatePages < ActiveRecord::Migration[5.1]
     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.integer :priority, default: 1, null: false
+
       t.timestamps null: false
     end
 

data/db/migrate/20171010055102_create_sections.rb

@@ -1,16 +1,35 @@
 class CreateSections < ActiveRecord::Migration[5.0]
   def self.up
     create_table :sections do |t|
+
+      t.string :name, null: false, limit: 64
+      t.string :code, null: false, limit: 64
+      
       t.string :title, :null => false, :limit=>256
       t.string :sub_title, :null => false, :limit=>256
+      
       t.string :short_description, :limit=>1048
       t.text :long_description
+
       t.string :button_one_text, :limit=>64
       t.string :button_two_text, :limit=>64
       t.string :button_one_link, :limit=>512
       t.string :button_two_link, :limit=>512
-      t.string :section_type, :limit=>64
+      
       t.string :status, :null => false, :default=>"unpublished", :limit=>16
+      t.integer :priority, default: 1, null: false
+
+      t.references :page, index: true
+
+      t.boolean :enable_title, default: false
+      t.boolean :enable_sub_title, default: false
+      t.boolean :enable_short_description, default: false
+      t.boolean :enable_long_description, default: false
+      t.boolean :enable_button_one, default: false
+      t.boolean :enable_button_two, default: false
+      t.boolean :enable_cover_image, default: false
+      t.boolean :enable_gallery_images, default: false
+
       t.timestamps null: false
     end
   end

data/db/migrate/20171012073510_create_testimonials.rb

@@ -4,9 +4,13 @@ class CreateTestimonials < ActiveRecord::Migration[5.0]
       t.string :name, :null => false, :limit=>256
       t.string :designation, :null => true, :limit=>256
       t.string :organisation, :null => true, :limit=>256
+
+      t.text :statement
+      
       t.string :status, :null => false, :limit=>64
       t.boolean :featured, default: false
-      t.text :statement
+      t.integer :priority, default: 1, null: false
+      
       t.timestamps null: false
     end
   end

data/db/migrate/20171012103805_create_team_members.rb

@@ -3,13 +3,17 @@ class CreateTeamMembers < ActiveRecord::Migration[5.0]
     create_table :team_members do |t|
       t.string :name
       t.string :designation
-      t.string :status
-      t.boolean :featured
       t.text :description
+
       t.string :linked_in_url
       t.string :google_plus_url
       t.string :facebook_url
       t.string :twitter_url
+
+      t.string :status, :null => false, :limit=>64
+      t.boolean :featured, default: false
+      t.integer :priority, default: 1, null: false
+
       t.timestamps null: false
     end
   end

data/db/migrate/20171012103806_create_blog_posts.rb

@@ -5,8 +5,8 @@ class CreateBlogPosts < ActiveRecord::Migration[5.0]
       t.string :title, null: false, limit: 256
       t.string :slug, null: true, limit: 64
       t.string :author, null: true, limit: 256
-      t.string :meta_description, null: true, limit: 512
-
+      
+      t.string :short_description, null: true, limit: 512
       t.text   :description
       
       t.datetime :posted_at, null: true
@@ -16,8 +16,11 @@ class CreateBlogPosts < ActiveRecord::Migration[5.0]
 
       t.text :tags
 
+      t.references :category, index: true
+
       t.timestamps null: false
     end
     add_index :blog_posts, :status
+    
   end
 end

data/db/migrate/20171014125055_create_services.rb

@@ -4,6 +4,8 @@ class CreateServices < ActiveRecord::Migration[5.1]
       t.string :name, :null => false, limit: 128
       t.string :one_liner
       t.string :permalink, :null => false, limit: 128
+      
+      t.string :short_description, null: true, limit: 512
       t.text   :description
 
       t.text :price

data/db/migrate/20171104163660_create_prices.rb

@@ -4,7 +4,9 @@ class CreatePrices < ActiveRecord::Migration[5.1]
       t.string :title, :null => false, limit: 128
       t.string :sub_title
       t.text :price
+      
       t.references :category, index: true
+      
       t.string :status, :null => false, :default=>"unpublished", :limit=>16
       t.boolean :featured, default: false
       t.integer :priority, default: 1, null: false

data/db/migrate/20171104163661_create_bookings.rb

@@ -14,6 +14,7 @@ class CreateBookings < ActiveRecord::Migration[5.1]
 
       t.boolean :featured, default: false
       t.string :status, :null => false, :default=>"new", :limit=>16
+      
       t.timestamps null: false
     end
 

data/db/migrate/20171120145548_create_promotion_and_promotion_enquiries.rb

@@ -15,9 +15,13 @@
       t.boolean :phone_mandatory, default: false, null: false
 
       t.boolean :featured, default: false
-      t.string :status, :null => false, :default=>"unpublished", :limit=>16
+      t.string :status, :null => false, :default=>"new", :limit=>16
       t.integer :priority, default: 1, null: false
 
+      t.boolean :show_popup, default: true, :null => false
+      t.boolean :show_only_on_homepage, default: true, :null => false
+      t.integer :popup_lifespan_in_minutes, default: 60, :null => false
+
       t.timestamps null: false
     end
 

data/db/migrate/20180101093434_create_projects.rb

@@ -4,10 +4,11 @@ class CreateProjects < ActiveRecord::Migration[5.1]
       t.string :name, :null => false, limit: 128
       t.string :permalink, :null => false, limit: 128
 
-      t.string :meta_description, :null => true, limit: 512
+      t.string :short_description, null: true, limit: 512
       t.text   :description
 
       t.string :client, :null => false, limit: 128
+      
       t.references :category
       
       t.string :status, :null => false, :default=>"unpublished", :limit=>16

data/lib/dhatu/version.rb

@@ -1,3 +1,5 @@
 module Dhatu
-  VERSION = '0.1.25'
+  VERSION = '0.2.0'
+  # The old version to migrate existing applications
+  # VERSION = '0.1.25'
 end

data/lib/tasks/dhatu/data.rake

@@ -25,7 +25,7 @@ namespace 'dhatu' do
         puts " "
       end
 
-      ["Dhatu::Category", "Dhatu::Service", "Dhatu::Project", "Dhatu::Section", "Dhatu::SectionType", "Dhatu::Event", "Dhatu::Offer", "Dhatu::Price", "Dhatu::Testimonial", "Dhatu::TeamMember", "Dhatu::Branch", "Dhatu::Promotion", "Dhatu::PromotionAttribute", "Dhatu::BlogPost"].each do |cls_name|
+      ["Dhatu::Category", "Dhatu::Page", "Dhatu::Service", "Dhatu::Project", "Dhatu::Section", "Dhatu::Event", "Dhatu::Offer", "Dhatu::Price", "Dhatu::Testimonial", "Dhatu::TeamMember", "Dhatu::Branch", "Dhatu::Promotion", "Dhatu::PromotionAttribute", "Dhatu::BlogPost"].each do |cls_name|
         name = cls_name.underscore.pluralize
         desc "Import #{cls_name.pluralize}"
         task name => :environment do
@@ -49,7 +49,7 @@ namespace 'dhatu' do
         desc "Import all dummy data in sequence"
         task 'all' => :environment do
 
-          import_list = ["dhatu/services", "dhatu/projects", "dhatu/sections", "dhatu/section_types", "dhatu/categories", "dhatu/events", "dhatu/offers", "dhatu/prices", "dhatu/testimonials", "dhatu/team_members"]
+          import_list = ["dhatu/pages", "dhatu/services", "dhatu/projects", "dhatu/sections", "dhatu/categories", "dhatu/events", "dhatu/offers", "dhatu/prices", "dhatu/testimonials", "dhatu/team_members"]
           
           import_list.each do |item|
             print "Loading #{item.split(':').last.titleize} \t".yellow
@@ -65,7 +65,7 @@ namespace 'dhatu' do
           puts " "
         end
 
-        ["Dhatu::Category", "Dhatu::Service", "Dhatu::Project", "Dhatu::Section", "Dhatu::SectionType", "Dhatu::Event", "Dhatu::Offer", "Dhatu::Price", "Dhatu::Testimonial", "Dhatu::TeamMember", "Dhatu::Branch", "Dhatu::Promotion", "Dhatu::PromotionAttribute", "Dhatu::BlogPost"].each do |cls_name|
+        ["Dhatu::Category", "Dhatu::Page", "Dhatu::Service", "Dhatu::Project", "Dhatu::Section", "Dhatu::Event", "Dhatu::Offer", "Dhatu::Price", "Dhatu::Testimonial", "Dhatu::TeamMember", "Dhatu::Branch", "Dhatu::Promotion", "Dhatu::PromotionAttribute", "Dhatu::BlogPost"].each do |cls_name|
           name = cls_name.underscore.pluralize
           desc "Load Dummy #{cls_name.pluralize}"
           task name => :environment do

data/spec/dummy/spec/factories/section.rb

@@ -13,7 +13,7 @@ FactoryBot.define do
     button_one_link "www.domain.com/link_one"
     button_two_link "www.domain.com/link_two"
 
-    association :section_type, factory: :section_type
+    association :page, factory: :page
   end
 
   factory :published_section, parent: :unpublished_section do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dhatu
 version: !ruby/object:Gem::Version
-  version: 0.1.25
+  version: 0.2.0
 platform: ruby
 authors:
 - kpvarma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-19 00:00:00.000000000 Z
+date: 2018-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -425,7 +425,6 @@ files:
 - app/controllers/dhatu/promotion_enquiries_controller.rb
 - app/controllers/dhatu/promotions_controller.rb
 - app/controllers/dhatu/resource_controller.rb
-- app/controllers/dhatu/section_types_controller.rb
 - app/controllers/dhatu/sections_controller.rb
 - app/controllers/dhatu/services_controller.rb
 - app/controllers/dhatu/team_members_controller.rb
@@ -448,7 +447,6 @@ files:
 - app/models/dhatu/promotion_attribute.rb
 - app/models/dhatu/promotion_enquiry.rb
 - app/models/dhatu/section.rb
-- app/models/dhatu/section_type.rb
 - app/models/dhatu/service.rb
 - app/models/dhatu/team_member.rb
 - app/models/dhatu/testimonial.rb
@@ -529,11 +527,6 @@ 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_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
@@ -565,19 +558,21 @@ files:
 - db/data/dummy/categories.csv
 - db/data/dummy/events.csv
 - db/data/dummy/offers.csv
+- db/data/dummy/pages.csv
 - db/data/dummy/prices.csv
 - db/data/dummy/promotions.csv
-- db/data/dummy/section_types.csv
 - db/data/dummy/sections.csv
 - db/data/dummy/services.csv
 - db/data/dummy/team_members.csv
 - db/data/dummy/testimonials.csv
+- db/data/pages.csv
 - db/data/permissions.csv
 - db/data/users.csv
 - db/master_data/features.csv
 - db/master_data/roles.csv
 - db/migrate/20160803045832_create_events.rb
 - db/migrate/20160803045832_create_offers.rb
+- db/migrate/20171010055101_create_pages.rb
 - db/migrate/20171010055102_create_sections.rb
 - db/migrate/20171012073510_create_testimonials.rb
 - db/migrate/20171012103805_create_team_members.rb
@@ -585,26 +580,11 @@ files:
 - db/migrate/20171014125053_create_branches.rb
 - db/migrate/20171014125054_create_categories.rb
 - db/migrate/20171014125055_create_services.rb
-- db/migrate/20171104163658_add_category_id_to_blog_posts.rb
-- db/migrate/20171104163659_add_priority_to_tables.rb
 - db/migrate/20171104163660_create_prices.rb
 - db/migrate/20171104163661_create_bookings.rb
-- db/migrate/20171104163662_add_category_id_to_tables.rb
-- db/migrate/20171120145545_remove_categories_from_section.rb
-- db/migrate/20171120145546_create_section_types.rb
-- 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/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
@@ -628,7 +608,6 @@ files:
 - spec/dummy/spec/factories/section.rb
 - spec/dummy/spec/factories/section_cover_image.rb
 - spec/dummy/spec/factories/section_gallery_image.rb
-- spec/dummy/spec/factories/section_type.rb
 - spec/dummy/spec/factories/team_member.rb
 - spec/dummy/spec/factories/test.jpg
 - spec/dummy/spec/factories/testimonial.rb

data/app/controllers/dhatu/section_types_controller.rb

@@ -1,77 +0,0 @@
-module Dhatu
-  class SectionTypesController < ResourceController
-
-    before_action :require_super_admin
-    
-    private
-
-    def get_resource
-      @r_object = @resource_options[:class].find_by_id(params[:id])
-    end
-
-    def get_collections
-      @relation = SectionType.where("")
-
-      parse_filters
-      apply_filters
-      
-      @section_types = @r_objects = @relation.page(@current_page).per(@per_page)
-
-      return true
-    end
-
-    def apply_filters
-      @relation = @relation.search(@query) if @query
-      
-      @order_by = "created_at desc" unless @order_by
-      @relation = @relation.order(@order_by)
-    end
-
-    def configure_filter_settings
-      @filter_settings = {
-        string_filters: [
-          { filter_name: :query }
-        ],
-        boolean_filters: [],
-        reference_filters: [],
-        variable_filters: [],
-      }
-    end
-
-    def configure_filter_ui_settings
-      @filter_ui_settings = {}
-    end
-
-    def resource_controller_configuration
-      {
-        page_title: "Section Types",
-        js_view_path: "/kuppayam/workflows/parrot",
-        view_path: "/dhatu/section_types",
-        show_modal_after_create: false,
-        show_modal_after_update: false,
-        collection_name: :section_types,
-        item_name: :section_type,
-        class: Dhatu::SectionType
-      }
-    end
-
-    def breadcrumbs_configuration
-      {
-        heading: "Manage Section Types",
-        icon: "fa-reorder",
-        description: "Listing all Section Types",
-        links: [{name: "Home", link: breadcrumb_home_path, icon: 'fa-home'}, 
-                  {name: "Manage Section Types", link: section_types_path, icon: 'fa-reorder', active: true}]
-      }
-    end
-
-    def permitted_params
-      params.require("dhatu/section_type").permit(:name, :code)
-    end
-
-    def set_navs
-      set_nav("dhatu/section_types")
-    end
-
-  end
-end

data/app/models/dhatu/section_type.rb

@@ -1,74 +0,0 @@
-class Dhatu::SectionType < Dhatu::ApplicationRecord
-
-  # Set Table Name
-  self.table_name = "section_types"
-
-  # Validations
-  validates :name, presence: true, length: {minimum: 3, maximum: 64}
-  validates :code, presence: true, length: {minimum: 3, maximum: 64}
-  
-  # ------------------
-  # Class Methods
-  # ------------------
-
-  scope :search, lambda {|query| where("LOWER(name) LIKE LOWER('%#{query}%') OR\
-                                        LOWER(code) LIKE LOWER('%#{query}%')")}
-  
-  scope :upcoming, lambda { where("created_at >= ?", Time.now) }
-  scope :past, lambda { where("created_at < ?", Time.now) }
-
-  # Associations
-  has_many :sections, :class_name => "Dhatu::Section"
-
-  def self.save_row_data(hsh)
-    # Initializing error hash for displaying all errors altogether
-    error_object = Kuppayam::Importer::ErrorHash.new
-
-    return error_object if hsh[:name].to_s.strip.blank?
-
-    section_type = Dhatu::SectionType.find_by_name(hsh[:name].to_s.strip) || Dhatu::SectionType.new
-    section_type.name = hsh[:name].to_s.strip
-    section_type.code = hsh[:code].to_s.strip
-    
-    if section_type.valid?
-      begin
-        section_type.save!
-      rescue Exception => e
-        summary = "uncaught #{e} exception while handling connection: #{e.message}"
-        details = "Stack trace: #{e.backtrace.map {|l| "  #{l}\n"}.join}"
-        error_object.errors << { summary: summary, details: details }        
-      end
-    else
-      summary = "Error while saving section_type: #{section_type.name}"
-      details = "Error! #{section_type.errors.full_messages.to_sentence}"
-      error_object.errors << { summary: summary, details: details }
-    end
-    return error_object
-  end
-
-  # ------------------
-  # Instance Methods
-  # ------------------
-
-  # Generic Methods
-  # ---------------
-  def to_param
-    "#{id}-#{name.parameterize[0..32]}"
-  end
-
-  def display_name
-    "#{name_was}"
-  end
-
-  # Permission Methods
-  # ------------------
-
-  def can_be_edited?
-    true
-  end
-
-  def can_be_deleted?
-    true
-  end
-
-end

data/app/views/dhatu/section_types1/_form.html.erb

@@ -1,20 +0,0 @@
-<%= form_for([@section_type], :html => {:id=>"form_section_type", :class=>"mb-0 form-horizontal", :role => "form", :method => (@section_type.new_record? ? :post : :put), :remote=>true}) do |f| %>
-
-      <div id="section_type_form_error">
-        <%= @section_type.errors[:base].to_sentence %>
-      </div>
-
-      <div class="form-inputs mb-30 mt-30">
-        <%= theme_form_field(@section_type, :name, label: "Name") %>
-        <%= theme_form_field(@section_type, :code, label: "Code") %>
-      </div>
-    
-      <div>
-        <%= submit_tag("Save", :class=>"btn btn-primary pull-right ml-10") %>
-        <%= link_to raw("<i class='fa fa-close mr-5'></i><span>Cancel</span>"), "#", onclick: "closeGenericModal();", class: "pull-right ml-10 btn btn-white" %>
-      </div>
-      <%= clear_tag(10) %>
-  </div>
-
-<% end %>
-

data/app/views/dhatu/section_types1/_index.html.erb

@@ -1,48 +0,0 @@
-<div class="table-responsive"> 
-	<table class="table table-hover members-table middle-align">
-	  <thead> 
-			<tr> 
-				<th style="text-align: center;width:60px">#</th> 
-				<th>Name</th>
-				<th>Code</th>
-				<% if display_manage_links? %>
-				<th style="text-align: center;">Actions</th>
-				<% end %>
-			</tr> 
-		</thead>
-	  <tbody>
-	  	<% @section_types.each_with_index do |section_type, i| %>
-	  		
-	  		<tr id="tr_section_type_<%= section_type.id %>">
-		      
-		      <th scope="row" style="text-align: center;">
-				    <% if i < 0 %>
-				      <i class="fa fa-check text-success"></i>
-				    <% else %>
-				      <%= i + 1 + (@per_page.to_i * (@current_page.to_i - 1)) %>
-				    <% end %>
-				  </th>
-		      
-		      <td class="section_type-name"><%= link_to section_type.display_name, section_type_path(section_type), remote: true %></td>
-
-					<td class="section_type-name"><%= link_to section_type.code, section_type_path(section_type), remote: true %></td>
-
-					<% if display_manage_links? %>
-			    
-			    <td class="action-links hidden-sm hidden-xs" style="width:10%">
-			      <%= display_manage_links(section_type, @current_user) %>
-			    </td>
-			    <% end %>
-		    </tr>
-		    
-		  <% end %>
-	  </tbody>
-	</table>
-</div>
-
-<div class="row">
-  <div class="col-sm-12">
-    <%= paginate_kuppayam(@section_types) %>
-  </div>
-</div>
-

data/app/views/dhatu/section_types1/_row.html.erb

@@ -1,20 +0,0 @@
-<tr id="tr_section_type_<%= section_type.id %>">
-          
-  <th scope="row" style="text-align: center;">
-    <% if i < 0 %>
-      <i class="fa fa-check text-success"></i>
-    <% else %>
-      <%= i + 1 + (@per_page.to_i * (@current_page.to_i - 1)) %>
-    <% end %>
-  </th>
-  
-  <td class="section_type-name"><%= link_to section_type.display_name, section_type_path(section_type), remote: true %></td>
-
-  <td class="section_type-name"><%= link_to section_type.code, section_type_path(section_type), remote: true %></td>
-
-  <% if display_manage_links? %>
-  <td class="action-links hidden-sm hidden-xs" style="width:10%">
-    <%= display_manage_links(section_type, @current_user) %>
-  </td>
-  <% end %>
-</tr>

data/app/views/dhatu/section_types1/_show.html.erb

@@ -1,41 +0,0 @@
-<div id="div_blog_post_show">
-
-  <div class="row">
-    
-    <div class="col-md-9 col-sm-12 col-xs-12" style="border-right:1px solid #f1f1f1;">
-    		<%= theme_panel_heading(@section_type.display_name) %>
-      	<%= theme_panel_sub_heading(@section_type.code, "#") %>
-      	<%= clear_tag(10) %>
-      	<div class="table-responsive mb-50"> 
-					<table class="table table-striped table-condensed table-bordered"> 
-						<tbody>
-							<tr>
-								<th>Name</th><td><%= @section_type.name %></td>
-							</tr>
-							<tr>
-								<th>Code</th><td><%= @section_type.code %></td>
-							</tr>
-							<tr>
-								<th>Created At</th><td><%= @section_type.created_at.strftime("%m/%d/%Y - %H:%M:%S") if @section_type.created_at %></td>
-							</tr>
-							<tr>
-								<th>Updated At</th><td><%= @section_type.updated_at.strftime("%m/%d/%Y - %H:%M:%S") if @section_type.updated_at %></td>
-							</tr>
-							
-						</tbody>
-					</table>
-				</div>
-      	<%= clear_tag(10) %>
-    </div>
-
-    <% if display_manage_links? %>
-    <div class="col-md-3 col-sm-12 col-xs-12">
-      <%= display_manage_buttons(@section_type) %>
-    </div>
-    <% end %>
-  </div>
-
-  <%= clear_tag(30) %>
-  <%= link_to "Close", "#", onclick: "closeGenericModal();", class: "btn btn-primary pull-right" %>
-  <%= clear_tag(10) %>
-</div>

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

@@ -1,43 +0,0 @@
-<div class="row">
-      
-  <div class="col-md-12">
-    
-    <ul class="nav nav-tabs">
-    </ul>
-    <div class="tab-content">
-      <div class="tab-pane active">
-
-        <div id="div_section_type_action_buttons">
-          <div class="row">
-            <div class="col-md-6">
-
-              <%= theme_button('Add a Section Type', 'plus', new_section_type_path(), classes: "pull-left mr-10", btn_type: "success") if @current_user.has_create_permission?(Dhatu::SectionType) %>
-
-              <%= theme_button('Refresh', 'refresh', section_types_path(), classes: "pull-left mr-10", btn_type: "white") %>
-
-            </div>
-            <div class="col-md-6">
-              <%= search_form_kuppayam(Dhatu::SectionType, section_types_path, text: @filters[:query]) %>
-            </div>
-          </div>
-        </div>
-        <%= clear_tag(10) %>
-
-        <div id="div_section_type_index">
-          <%= render :partial=>"dhatu/section_types/index" %>
-        </div>
-        <%= clear_tag(10) %>
-
-      </div>
-    </div>
-
-  </div>
-
-</div>
-
-<script type="text/javascript">
-  $('body').on('change', '#inp_name', function() {
-    var sectionCode = $(this).val().replace(/ /g, '_').toUpperCase().slice(0, 63);
-    $('#inp_code').val(sectionCode);
-  });
-</script>

data/db/data/dummy/section_types.csv

@@ -1,15 +0,0 @@
-name,code
-About Us Banner,ABOUT_US_BANNER
-Contact Us Banner,CONTACT_US_BANNER
-Blog Banner,BLOG_BANNER
-Offers Banner,OFFERS_BANNER
-Services Banner,SERVICES_BANNER
-Products Banner,PRODUCTS_BANNER
-Projects Banner,PROJECTS_BANNER
-Home Page Slider 1,HOME_PAGE_SLIDE
-Home Page Slider 2,HOME_PAGE_SLIDE
-Home Page Slider 3,HOME_PAGE_SLIDE
-Book Now,BOOK_NOW
-About Us,ABOUT_US
-Contact Us,CONTACT_US
-About Us Footer,ABOUT_US_FOOTER

data/db/migrate/20171104163658_add_category_id_to_blog_posts.rb

@@ -1,5 +0,0 @@
-class AddCategoryIdToBlogPosts < ActiveRecord::Migration[5.1]
-  def change
-  	add_reference :blog_posts, :category, index: true
-  end
-end

data/db/migrate/20171104163659_add_priority_to_tables.rb

@@ -1,8 +0,0 @@
-class AddPriorityToTables < ActiveRecord::Migration[5.1]
-  def change
-  	add_column :events, :priority, :integer, default: 1000
-  	add_column :offers, :priority, :integer, default: 1000
-  	add_column :testimonials, :priority, :integer, default: 1000
-  	add_column :team_members, :priority, :integer, default: 1000
-  end
-end

data/db/migrate/20171104163662_add_category_id_to_tables.rb

@@ -1,7 +0,0 @@
-class AddCategoryIdToTables < ActiveRecord::Migration[5.1]
-  def change
-  	add_reference :events, :category, index: true
-  	add_reference :offers, :category, index: true
-  	add_reference :sections, :category, index: true
-  end
-end

data/db/migrate/20171120145545_remove_categories_from_section.rb

@@ -1,5 +0,0 @@
-class RemoveCategoriesFromSection < ActiveRecord::Migration[5.1]
-  def change
-  	remove_reference :sections, :category, index: true
-  end
-end

data/db/migrate/20171120145546_create_section_types.rb

@@ -1,9 +0,0 @@
-class CreateSectionTypes < ActiveRecord::Migration[5.1]
-  def change
-    create_table :section_types do |t|
-      t.string :name, :null => false, limit: 64
-      t.string :code, :null => false, limit: 64
-      t.timestamps null: false
-    end
-  end
-end

data/db/migrate/20171120145547_add_section_type_id_to_sections.rb

@@ -1,15 +0,0 @@
-class AddSectionTypeIdToSections < ActiveRecord::Migration[5.1]
-  def change
-  	add_reference :sections, :section_type, index: true
-
-  	begin
-	  	Dhatu::Section.all.each do |section|
-	  		section_type = Dhatu::SectionType.find_by_code(section.section_type) || Dhatu::SectionType.create(title: section.section_type.titleize, code: section.section_type)
-	  		section.update_attribute(section_type_id: section_type.id)
-	  	end
-	  rescue
-	  end
-
-  	remove_column :sections, :section_type
-  end
-end

data/db/migrate/20171203114528_change_default_status_of_promotion_enquiries.rb

@@ -1,8 +0,0 @@
-class ChangeDefaultStatusOfPromotionEnquiries < ActiveRecord::Migration[5.1]
-  def up
-    change_column_default :promotion_enquiries, :status, "new"
-  end
-  def down
-    change_column_default :promotion_enquiries, :status, "unpublished"
-  end
-end

data/db/migrate/20171203114530_add_control_fields_to_promotions.rb

@@ -1,7 +0,0 @@
-class AddControlFieldsToPromotions < ActiveRecord::Migration[5.1]
-  def change
-  	add_column :promotions, :show_popup, :boolean, default: true, :null => false
-  	add_column :promotions, :show_only_on_homepage, :boolean, default: true, :null => false
-  	add_column :promotions, :popup_lifespan_in_minutes, :integer, default: 60, :null => false
-  end
-end

data/db/migrate/20180101093437_add_page_id_to_sections.rb

@@ -1,5 +0,0 @@
-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

@@ -1,6 +0,0 @@
-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

@@ -1,34 +0,0 @@
-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

@@ -1,19 +0,0 @@
-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

@@ -1,7 +0,0 @@
-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

@@ -1,19 +0,0 @@
-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/spec/dummy/spec/factories/section_type.rb

@@ -1,6 +0,0 @@
-FactoryBot.define do
-  factory :section_type, class: Dhatu::SectionType do
-    name "About Us"
-    code "ABOUT_US"
-  end
-end