usman 0.4.7.pre.materialize → 0.4.8.pre.materialize

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 419f3d7642de408924fce9263bd0023def32a14decc626e43ec8942f1bf0af01
-  data.tar.gz: 55f104be6aec796794e4e2371fe66f790e2dc5a4ef517abd9f74ff2ba609e078
+  metadata.gz: 66dc8ae67a0f4b53e9c47c8bddd8d29c3779d87bcfe022e8cee1864e2fb3cfc1
+  data.tar.gz: ab508cc18eecdd1573af41bdc55f66b26b55a3732d7a88e274d35752bdc3c20e
 SHA512:
-  metadata.gz: 36b2940fa7975409c63d048b7ac424416e0004463a1bfb5416e9480eb92b60a6a5611a2cfe10e2cdfd68ac44ea09644f80a9294aabe1aed72907e66fad8f83f5
-  data.tar.gz: 14f120a3e96dad545b5d208b523b88b65797b14a02ec3c75f32d2c2cfbeaff2895ea51d71c64bc0a2da045b6e39c9adc395a0f35e2694be58c47514891884737
+  metadata.gz: 874a83bd0cbae9dd9d942fb8e5c537084a9bb48e7dec9ffdd574fdf7161f358391a41637d998d51d1e82daaf763e096816f8b0e85190b8abdded1a71b99cb208
+  data.tar.gz: e633d77de6328007a0cd4f3b63c49e71c13a36073ad6fb82588a34c920abbaabb9d4e89f088637fa8cecbec1042bb4514be5310576226df5c1ecbc5f294abffc

data/app/controllers/usman/api/v1/docs_controller.rb

@@ -453,7 +453,7 @@ module Usman
 
         def set_nav_items
           @nav_items = {
-            register: { nav_class: "docs/usman/register", icon_class: "fa-group", url: usman.docs_api_v1_register_path, text: "Registraions API"},
+            register: { nav_class: "docs/usman/register", icon_class: "fa-user", url: usman.docs_api_v1_register_path, text: "Registraions API"},
             resend_otp: { nav_class: "docs/usman/resend_otp", icon_class: "fa-send", url: usman.docs_api_v1_resend_otp_path, text: "Resend OTP API"},
             verify_otp: { nav_class: "docs/usman/verify_otp", icon_class: "fa-thumbs-up", url: usman.docs_api_v1_verify_otp_path, text: "Verify OTP API"},
             accept_tac: { nav_class: "docs/usman/accept_tac", icon_class: "fa-check-square-o", url: usman.docs_api_v1_accept_tac_path, text: "Accept T&C API"},
@@ -474,7 +474,7 @@ module Usman
 
         def set_tab_items
           @tab_items = {
-            usman: { nav_class: "docs/usman", icon_class: "fa-group", url: usman.docs_api_v1_register_path, text: "User APIs"}
+            usman: { nav_class: "docs/usman", icon_class: "fa-user", url: usman.docs_api_v1_register_path, text: "User APIs"}
           }
         end
 

data/app/controllers/usman/application_controller.rb

@@ -3,8 +3,6 @@ module Usman
     
     include Usman::AuthenticationHelper
 
-    layout 'kuppayam/xenon/admin'
-    
     before_action :current_user
     before_action :require_user
 
@@ -12,14 +10,6 @@ module Usman
     
     private
 
-    def stylesheet_filename
-      @stylesheet_filename = "kuppayam-xenon"
-    end
-
-    def javascript_filename
-      @javascript_filename = "kuppayam-xenon"
-    end
-    
     def set_default_title
       set_title("Usman Admin | User Management Module")
     end

data/app/controllers/usman/features_controller.rb

@@ -4,17 +4,9 @@ module Usman
     before_action :require_super_admin
 
     def update_permission
-      @permission = Permission.find_by_id(params[:permission_id])
       @user = User.find_by_id(params[:user_id])
-      if @permission
-        begin
-          @permission.toggle!(params[:permission_for])
-          @success = true
-        rescue
-          @success = false
-        end
-      else
-        @permission = Permission.new(user: @user, can_read: false, feature_id: params[:id])
+      @permission = Permission.find_by_id(params[:permission_id]) || Permission.where(user: @user, feature_id: params[:id]).first || Permission.new(user: @user, can_read: false, feature_id: params[:id])
+      if @permission.new_record?
         @permission.assign_attributes(params[:permission_for] => true)
         if @permission.valid?
           @permission.save
@@ -22,6 +14,13 @@ module Usman
         else
           @success = false
         end
+      else
+        begin
+          @permission.toggle!(params[:permission_for])
+          @success = true
+        rescue
+          @success = false
+        end
       end
     end
     
@@ -33,6 +32,7 @@ module Usman
     end
 
     def get_collections
+      @feature_categories = Feature.select("DISTINCT feature_category").map(&:feature_category)
       @relation = Feature.includes(:cover_image).where("")
 
       parse_filters
@@ -47,6 +47,10 @@ module Usman
       @relation = @relation.search(@query) if @query
       @relation = @relation.status(@status) if @status
       
+      # Set first feature category as default feature category
+      @feature_category = @feature_categories.first if @feature_category.blank?
+      @relation = @relation.where(feature_category: @feature_category)
+
       @order_by = "created_at desc" unless @order_by
       @relation = @relation.order(@order_by)
     end
@@ -55,7 +59,8 @@ module Usman
       @filter_settings = {
         string_filters: [
           { filter_name: :query },
-          { filter_name: :status }
+          { filter_name: :status },
+          { filter_name: :feature_category },
         ],
         boolean_filters: [],
         reference_filters: [],
@@ -68,13 +73,13 @@ module Usman
         status: {
           object_filter: false,
           select_label: "Select Status",
-          display_hash: Feature::STATUS,
+          display_hash: Feature::STATUS_REVERSE,
           current_value: @status,
-          values: Feature::STATUS_REVERSE,
+          values: Feature::STATUS,
           current_filters: @filters,
           filters_to_remove: [],
           filters_to_add: {},
-          url_method_name: 'users_url',
+          url_method_name: 'features_url',
           show_all_filter_on_top: true
         }
       }
@@ -101,7 +106,7 @@ module Usman
     end
 
     def permitted_params
-      params.require(:feature).permit(:name, :categorisable)
+      params.require(:feature).permit(:name, :categorisable, :feature_category)
     end
 
     def set_navs

data/app/controllers/usman/resource_controller.rb

@@ -20,6 +20,7 @@ module Usman
       @filter_param_mapping[:super_admin] = :sa
       @filter_param_mapping[:user] = :us
       @filter_param_mapping[:feature] = :ft
+      @filter_param_mapping[:feature_category] = :fc
     end
   end
 end

data/app/controllers/usman/sessions_controller.rb

@@ -86,6 +86,10 @@ module Usman
     def user_params
       params[:user].permit(:password, :password_confirmation, :reset_password_token)
     end
-    
+
+    def determine_layout
+      "kuppayam/#{@current_layout}/blank"
+    end
+
   end
 end

data/app/controllers/usman/users_controller.rb

@@ -130,10 +130,10 @@ module Usman
     def breadcrumbs_configuration
       {
         heading: "Manage Users",
-        icon: "fa-group",
+        icon: "fa-user",
         description: "Listing all Users",
         links: [{name: "Home", link: breadcrumb_home_path, icon: 'fa-home'}, 
-                  {name: "Manage Users", link: users_path, icon: 'fa-group', active: true}]
+                  {name: "Manage Users", link: users_path, icon: 'fa-user', active: true}]
       }
     end
 

data/app/models/feature.rb

@@ -18,10 +18,8 @@ class Feature < Usman::ApplicationRecord
   has_one :cover_image, :as => :imageable, :dependent => :destroy, :class_name => "Image::CoverImage"
   
 	# Validations
-	validates :name, presence: true, length: {minimum: 3, maximum: 250}
-
-
-  
+  validates :name, presence: true, length: {minimum: 3, maximum: 250}
+	validates :feature_category, presence: true, length: {minimum: 2, maximum: 64}
 	
   # ------------------
   # Class Methods

data/app/views/layouts/kuppayam/{_sidebar.html.erb → materialize/_sidebar.html.erb}

@@ -103,7 +103,7 @@
 			
 			<li class="">
 				<a href="#">
-					<i class="fa-group"></i>
+					<i class="fa-user"></i>
 					<span class="title">Manage Users</span>
 				</a>
 				<ul>
@@ -161,7 +161,7 @@
 				<ul>
 					<li class="">
 				    <a href="/docs/api/v1/register">
-				      <i class="fa-group"></i>
+				      <i class="fa-user"></i>
 				      <span class="title">Authentication APIs</span>
 				    </a>
 				  </li>

data/app/views/layouts/kuppayam/xenon/_footer.html.erb

@@ -0,0 +1,25 @@
+<footer class="main-footer sticky footer-type-1">
+	
+	<div class="footer-inner">
+		
+		<!-- Add your copyright text here -->
+		<div class="footer-text">
+			&copy; 2017 
+			<strong>Kuppayam</strong> 
+
+			All rights reserved. <br>developed, maintained and hosted by <a href="http://rightsolutions.io" target="_blank" style="color:red">Right Solutions</a>
+		</div>
+		
+		
+		<!-- Go to Top Link, just add rel="go-top" to any link to add this functionality -->
+		<div class="go-up">
+			
+			<a href="#" rel="go-top">
+				<i class="fa-angle-up"></i>
+			</a>
+			
+		</div>
+		
+	</div>
+	
+</footer>

data/app/views/layouts/kuppayam/xenon/_header.html.erb

@@ -0,0 +1,43 @@
+<div class="top-bar">
+  <div class="top-bar-left">
+    <ul class="dropdown menu" data-dropdown-menu>
+      <li class="menu-text">Site Title</li>
+      <li>
+        <a href="#">One</a>
+        <ul class="menu vertical">
+          <li><a href="#">One</a></li>
+          <li><a href="#">Two</a></li>
+          <li><a href="#">Three</a></li>
+        </ul>
+      </li>
+      <li><a href="#">Two</a></li>
+      <li><a href="#">Three</a></li>
+    </ul>
+  </div>
+  <div class="top-bar-right">
+    <ul class="menu">
+      <li><input type="search" placeholder="Search"></li>
+      <li><button type="button" class="button">Search</button></li>
+    </ul>
+  </div>
+</div>
+
+<div class="header mb-40">
+
+  <div class="visible-xs pull-left mt-10">
+    <a href="#menu-toggle" class="btn btn-default" id="menu-toggle"><i class="fa fa-list"></i></a>
+    <%#= theme_button('', 'list', "#menu-toggle", btn_type: "default", id: "menu-toggle", classes: "") %>
+  </div>
+
+  <div class="pull-right mt-10">
+    <% if @current_user %>
+        <span style="color:#898989;">Welcome</span> <span style="color:#4b4b4b;"><%= @current_user.name %></span>
+        &nbsp;&nbsp;|&nbsp;&nbsp;
+        <%= link_to raw("Sign Out"), usman.sign_out_path, method: :delete %>
+    <% else %>
+      <%= link_to raw("Sign In"), "#" %>
+    <% end %>
+  </div>
+  <div class="cl-10"></div>
+</div>
+

data/app/views/layouts/kuppayam/xenon/_navbar.html.erb

@@ -0,0 +1,55 @@
+<nav class="navbar user-info-navbar"  role="navigation"><!-- User Info, Notifications and Menu Bar -->
+	
+	<!-- Left links for user info navbar -->
+	<ul class="user-info-menu left-links list-inline list-unstyled">
+		
+		<li class="hidden-sm hidden-xs">
+			<a href="#" data-toggle="sidebar">
+				<i class="fa-bars"></i>
+			</a>
+		</li>
+		
+	</ul>
+	
+	<!-- Right links for user info navbar -->
+	<ul class="user-info-menu right-links list-inline list-unstyled">
+		<li class="dropdown user-profile">
+			<a href="#" class="dropdown-toggle" data-toggle="dropdown">
+				
+				<%= display_image(@current_user, "profile_picture.image.small.url", width: "32", height: "auto", class: "img-circle img-inline userpic-32", alt: @current_user.display_name) %>
+				
+				<span>
+					<%= @current_user.display_name %>
+					<i class="fa-angle-down"></i>
+				</span>
+				
+			</a>
+			
+			<ul class="dropdown-menu user-profile-menu list-unstyled">
+				<li>
+					<a href="#settings">
+						<i class="fa-wrench"></i>
+						Settings
+					</a>
+				</li>
+				<li>
+					<a href="#profile">
+						<i class="fa-user"></i>
+						Profile
+					</a>
+				</li>
+				<li>
+					<a href="#help">
+						<i class="fa-info"></i>
+						Help
+					</a>
+				</li>
+				<li class="last">
+					<%= link_to raw("<i class='fa-lock'></i>Sign Out"), usman.sign_out_path, method: :delete %>
+				</li>
+			</ul>
+		</li>
+		
+	</ul>
+	
+</nav>

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

@@ -0,0 +1,175 @@
+<%
+	user_items = {
+		users: {
+			text: "Manage Users",
+			icon_class: "fa-user",
+			url: usman.users_url,
+			has_permission: @current_user.has_read_permission?(User)
+		},
+		registrations: {
+			text: "Manage Registrations",
+			icon_class: "fa-mobile",
+			url: usman.registrations_url,
+			has_permission: @current_user.has_read_permission?(Registration)
+		},
+		roles: {
+			text: "Manage Roles",
+			icon_class: "fa-graduation-cap",
+			url: usman.roles_url,
+			has_permission: @current_user.has_read_permission?(Role)
+		},
+		permissions: {
+			text: "Manage Permissions",
+			icon_class: "fa-lock",
+			url: usman.permissions_url,
+			has_permission: @current_user.has_read_permission?(Permission)
+		}
+	}
+%>
+<%
+	configuration_items = {
+		features: {
+			text: "Manage Features",
+			icon_class: "fa-diamond",
+			url: usman.features_url,
+			has_permission: @current_user.has_read_permission?(Feature)
+		}
+	}
+%>
+<%
+	pattana_items = {
+		countries: {
+			text: "Manage Countries",
+			icon_class: "fa-flag-checkered",
+			url: pattana.countries_url,
+			has_permission: @current_user.has_read_permission?(Country)
+		},
+		regions: {
+			text: "Manage Regions",
+			icon_class: "fa-globe",
+			url: pattana.regions_url,
+			has_permission: @current_user.has_read_permission?(Region)
+		},
+		cities: {
+			text: "Manage Cities",
+			icon_class: "fa-map-marker",
+			url: pattana.cities_url,
+			has_permission: @current_user.has_read_permission?(City)
+		},
+		
+	}
+%>
+
+<div class="sidebar-menu toggle-others collapsed">
+	
+	<div class="sidebar-menu-inner">
+		
+		<header class="logo-env">
+			<!-- logo -->
+			<div class="logo">
+				<a href="/" class="logo-expanded">
+					<%= image_tag("logo-white.png", width: "180") %>
+				</a>
+				<a href="/" class="logo-collapsed">
+					<%= image_tag("logo-small.png", width: "40") %>
+				</a>
+			</div>
+			
+			<!-- This will toggle the mobile menu and will be visible only on mobile devices -->
+			<div class="mobile-menu-toggle visible-xs">
+				<!-- <a href="#" data-toggle="notifications-menu">
+					<i class="fa-bell-o"></i><span class="badge badge-success">7</span>
+				</a> -->
+				<a href="#" data-toggle="user-info-menu">
+					<%= display_image(@current_user, "profile_picture.image.small.url", width: "32", height: "auto", class: "img-circle img-inline userpic-32", alt: @current_user.display_name) %>
+				</a>
+				<a href="#" data-toggle="mobile-menu"><i class="fa-bars"></i></a>
+			</div>
+		</header>
+		
+		<!-- add class "multiple-expanded" to allow multiple submenus to open -->
+		<!-- class "auto-inherit-active-class" will automatically add "active" class for parent elements who are marked already with class "active" -->
+		<ul id="main-menu" class="main-menu multiple-expanded auto-inherit-active-class">
+			<!-- Admin Dashboard -->
+			<% if @current_user.super_admin? || @current_user.has_role?("Site Admin") %>
+				<li class="<%= nav_active?('admin/dashboard') ? 'active' : ''  %>">
+					<%= link_to raw("<i class=\"fa-desktop\"></i> <span class='title'>Dashboard</span>"), usman.dashboard_path %>
+				</li>
+			<% else %>
+				<li class="<%= nav_active?('profile/dashboard') ? 'active' : ''  %>">
+					<%= link_to raw("<i class=\"fa-desktop\"></i> <span class='title'>Dashboard</span>"), usman.my_account_url %>
+				</li>
+			<% end %>
+			
+			<li class="">
+				<a href="#">
+					<i class="fa-user"></i>
+					<span class="title">Manage Users</span>
+				</a>
+				<ul>
+					<% user_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>
+
+			<li class="">
+				<a href="#">
+					<i class="fa-cog"></i>
+					<span class="title">Configure</span>
+				</a>
+				<ul>
+					<% configuration_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>
+
+			<li class="">
+				<a href="#">
+					<i class="fa-globe"></i>
+					<span class="title">Manage Location</span>
+				</a>
+				<ul>
+					<% pattana_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>
+
+			<li class="<%= nav_active?('profile/profile') ? 'active' : ''  %>">
+				<a href="#"><i class="fa-user"></i><span class="title">My Account</span></a>
+				<ul>
+					<li class="<%= nav_class("profile/settings") %>">
+				    <%= link_to raw("<i class=\"fa-cog\"></i> <span class='title'>User Settings</span>"), "#" %>
+				  </li>
+				</ul>
+			</li>
+
+			<!-- API Documentation -->
+			<li class="<%= nav_active?('docs/index') ? 'active' : ''  %>">
+				<a href="#"><i class="fa-file-code-o"></i><span class="title">API Documentation</span></a>
+				<ul>
+					<li class="">
+				    <a href="/docs/api/v1/register">
+				      <i class="fa-user"></i>
+				      <span class="title">Authentication APIs</span>
+				    </a>
+				  </li>
+				</ul>
+			</li>
+
+		</ul>
+		
+	</div>
+	
+</div>

data/app/views/usman/dashboard/bootstrap4/_index.html.erb

@@ -0,0 +1,40 @@
+<%
+	usman_items = {
+		users: {
+			text: "Users",
+			icon_class: "fa-user",
+			url: usman.users_url,
+			has_permission: @current_user.has_read_permission?(User)
+		},
+		registrations: {
+			text: "Registrations",
+			icon_class: "fa-mobile",
+			url: usman.registrations_url,
+			has_permission: @current_user.has_read_permission?(Registration)
+		},
+		roles: {
+			text: "Roles",
+			icon_class: "fa-graduation-cap",
+			url: usman.roles_url,
+			has_permission: @current_user.has_read_permission?(Role)
+		},
+		permissions: {
+			text: "Permissions",
+			icon_class: "fa-lock",
+			url: usman.permissions_url,
+			has_permission: @current_user.has_read_permission?(Permission)
+		},
+	}
+%>
+
+<% if (usman_items.map{|x, y| y[:has_permission] }).compact.uniq.any? %>
+
+<h3 class="text-gray mt-50 mb-10">
+	Manage User <br>
+	<small class="text-muted">Manage Users, Role and much more...</small>
+</h3>
+<hr class="mb-30" style="border-top:1px solid #ddd;">
+
+<%= render partial: "/layouts/dashboard/bootstrap4/items", locals: { items: usman_items } %>
+
+<% end %>

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

@@ -0,0 +1,22 @@
+<%
+	super_admin_items = {
+		features: {
+			text: "Features",
+			icon_class: "fa-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/bootstrap4/items", locals: { items: super_admin_items } %>
+
+<% end %>

data/app/views/usman/dashboard/materialize/_index.html.erb

@@ -0,0 +1,40 @@
+<%
+	usman_items = {
+		users: {
+			text: "Users",
+			icon_class: "fa-user",
+			url: usman.users_url,
+			has_permission: @current_user.has_read_permission?(User)
+		},
+		registrations: {
+			text: "Registrations",
+			icon_class: "fa-mobile",
+			url: usman.registrations_url,
+			has_permission: @current_user.has_read_permission?(Registration)
+		},
+		roles: {
+			text: "Roles",
+			icon_class: "fa-graduation-cap",
+			url: usman.roles_url,
+			has_permission: @current_user.has_read_permission?(Role)
+		},
+		permissions: {
+			text: "Permissions",
+			icon_class: "fa-lock",
+			url: usman.permissions_url,
+			has_permission: @current_user.has_read_permission?(Permission)
+		},
+	}
+%>
+
+<% if (usman_items.map{|x, y| y[:has_permission] }).compact.uniq.any? %>
+
+<h3 class="text-gray mt-50 mb-10">
+	Manage User <br>
+	<small class="text-muted">Manage Users, Role and much more...</small>
+</h3>
+<hr class="mb-30" style="border-top:1px solid #ddd;">
+
+<%= render partial: "/layouts/dashboard/materialize/items", locals: { items: usman_items } %>
+
+<% end %>

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

@@ -0,0 +1,22 @@
+<%
+	super_admin_items = {
+		features: {
+			text: "Features",
+			icon_class: "fa-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/materialize/items", locals: { items: super_admin_items } %>
+
+<% end %>

data/app/views/usman/dashboard/{_index.html.erb → xenon/_index.html.erb}

@@ -2,7 +2,7 @@
 	usman_items = {
 		users: {
 			text: "Users",
-			icon_class: "fa-group",
+			icon_class: "fa-user",
 			url: usman.users_url,
 			has_permission: @current_user.has_read_permission?(User)
 		},
@@ -35,6 +35,6 @@
 </h3>
 <hr class="mb-30" style="border-top:1px solid #ddd;">
 
-<%= render partial: "/layouts/dashboard/items", locals: { items: usman_items } %>
+<%= render partial: "/layouts/dashboard/xenon/items", locals: { items: usman_items } %>
 
 <% end %>

data/app/views/usman/dashboard/{_super_admin_index.html.erb → xenon/_super_admin_index.html.erb}

@@ -17,6 +17,6 @@
 </h3>
 <hr class="mb-30" style="border-top:1px solid #ddd;">
 
-<%= render partial: "/layouts/dashboard/items", locals: { items: super_admin_items } %>
+<%= render partial: "/layouts/dashboard/xenon/items", locals: { items: super_admin_items } %>
 
 <% end %>

data/app/views/usman/features/_form.html.erb

@@ -6,6 +6,7 @@
 
       <div class="form-inputs mb-30 mt-30">
         <%= theme_form_field(@feature, :name, label: "Class Name") %>
+        <%= theme_form_field(@feature, :feature_category, label: "Feature Category") %>
         <%= theme_form_field(@feature, :categorisable, required: false, html_options: {type: :checkbox}) %>
       </div>
     

data/app/views/usman/features/index.html.erb

@@ -3,6 +3,11 @@
   <div class="col-md-12">
     
     <ul class="nav nav-tabs">
+      <% @feature_categories.uniq.each do |f| %>
+      <li class="<%= @feature_category == f ? 'active' : '' %>">
+        <%= link_to f, features_path(fc: f) %>
+      </li>
+      <% end %>
     </ul>
     <div class="tab-content">
       <div class="tab-pane active">
@@ -20,6 +25,19 @@
               <%= search_form_kuppayam(Feature, features_path, text: @filters[:query]) %>
             </div>
           </div>
+
+          <div class="row">
+            <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/db/migrate/20180515030422_add_feature_category_to_features.rb

@@ -0,0 +1,23 @@
+class AddFeatureCategoryToFeatures < ActiveRecord::Migration[5.1]
+  def change
+  	add_column :features, :feature_category, :string, :null => false, :limit=>64, default: "Default"
+  	Feature.update_all("feature_category = 'Default'")
+  	
+  	Feature.where("").update_all("feature_category = 'Default'")
+  	
+  	Feature.where("name like '%Dhatu%'").update_all("feature_category = 'Website Features'")
+  	
+  	Feature.where("name like '%Promotion%'").update_all("feature_category = 'Marketing Features'")
+  	Feature.where("name like '%Offer%'").update_all("feature_category = 'Marketing Features'")
+  	Feature.where("name like '%Booking%'").update_all("feature_category = 'Marketing Features'")
+  	Feature.where("name like '%Blog%'").update_all("feature_category = 'Marketing Features'")
+
+  	Feature.where("name like '%User%'").update_all("feature_category = 'Admin'")
+  	Feature.where("name like '%Role%'").update_all("feature_category = 'Admin'")
+  	Feature.where("name like '%Permission%'").update_all("feature_category = 'Admin'")
+  	Feature.where("name like '%Feature%'").update_all("feature_category = 'Admin'")
+  	Feature.where("name like '%Country%' or name like '%Countries%'").update_all("feature_category = 'Admin'")
+  	Feature.where("name like '%Region%'").update_all("feature_category = 'Admin'")
+  	Feature.where("name like '%City%' or name like '%Cities%'").update_all("feature_category = 'Admin'")
+  end
+end

data/lib/usman/version.rb

@@ -1,3 +1,3 @@
 module Usman
-  VERSION = '0.4.7.pre.materialize'
+  VERSION = '0.4.8.pre.materialize'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usman
 version: !ruby/object:Gem::Version
-  version: 0.4.7.pre.materialize
+  version: 0.4.8.pre.materialize
 platform: ruby
 authors:
 - kpvarma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-08 00:00:00.000000000 Z
+date: 2018-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -104,28 +104,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.7.pre.materialize
+        version: 0.2.8.pre.materialize
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.7.pre.materialize
+        version: 0.2.8.pre.materialize
 - !ruby/object:Gem::Dependency
   name: pattana
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.5.pre.materialize
+        version: 0.2.6.pre.materialize
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.5.pre.materialize
+        version: 0.2.6.pre.materialize
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
@@ -452,11 +452,15 @@ files:
 - app/services/usman/sms_service.rb
 - app/uploaders/feature_image_uploader.rb
 - app/uploaders/profile_picture_uploader.rb
-- app/views/layouts/kuppayam/_footer.html.erb
-- app/views/layouts/kuppayam/_header.html.erb
-- app/views/layouts/kuppayam/_navbar.html.erb
-- app/views/layouts/kuppayam/_sidebar.html.erb
-- app/views/layouts/kuppayam/profile.html.erb
+- app/views/layouts/kuppayam/materialize/_footer.html.erb
+- app/views/layouts/kuppayam/materialize/_header.html.erb
+- app/views/layouts/kuppayam/materialize/_navbar.html.erb
+- app/views/layouts/kuppayam/materialize/_sidebar.html.erb
+- app/views/layouts/kuppayam/xenon/_footer.html.erb
+- app/views/layouts/kuppayam/xenon/_header.html.erb
+- app/views/layouts/kuppayam/xenon/_navbar.html.erb
+- app/views/layouts/kuppayam/xenon/_sidebar.html.erb
+- app/views/layouts/kuppayam/xenon/profile.html.erb
 - app/views/usman/api/v1/docs/accept_tac/_neg_case_1.html.erb
 - app/views/usman/api/v1/docs/accept_tac/_neg_case_2.html.erb
 - app/views/usman/api/v1/docs/accept_tac/_neg_case_3.html.erb
@@ -526,9 +530,13 @@ files:
 - app/views/usman/api/v1/docs/verify_otp/_neg_case_4.html.erb
 - app/views/usman/api/v1/docs/verify_otp/_pos_case_1.html.erb
 - app/views/usman/api/v1/docs/verify_otp/_pos_case_2.html.erb
-- app/views/usman/dashboard/_index.html.erb
-- app/views/usman/dashboard/_super_admin_index.html.erb
+- app/views/usman/dashboard/bootstrap4/_index.html.erb
+- app/views/usman/dashboard/bootstrap4/_super_admin_index.html.erb
 - app/views/usman/dashboard/index.html.erb
+- app/views/usman/dashboard/materialize/_index.html.erb
+- app/views/usman/dashboard/materialize/_super_admin_index.html.erb
+- app/views/usman/dashboard/xenon/_index.html.erb
+- app/views/usman/dashboard/xenon/_super_admin_index.html.erb
 - app/views/usman/features/_form.html.erb
 - app/views/usman/features/_index.html.erb
 - app/views/usman/features/_permissions.html.erb
@@ -595,6 +603,7 @@ files:
 - db/migrate/20170929083236_add_country_city_to_users.rb
 - db/migrate/20171124071245_create_contacts.rb
 - db/migrate/20171212094209_correct_contacts.rb
+- db/migrate/20180515030422_add_feature_category_to_features.rb
 - lib/tasks/usman/data.rake
 - lib/tasks/usman/master_data.rake
 - lib/temp/features.rake