usman 0.1.6dev2 → 0.2.0

data/app/models/registration.rb

@@ -0,0 +1,108 @@
+class Registration < ApplicationRecord
+  
+  # Constants
+  PENDING = "pending"
+  VERIFIED = "verified"
+  
+  STATUS = { 
+    PENDING => "Pending", 
+    VERIFIED => "Verified"
+  }
+
+  STATUS_REVERSE = { 
+    "Pending" => PENDING,
+    "Verified" => VERIFIED
+  }
+  
+	# Associations
+  has_one :user
+  belongs_to :country
+  belongs_to :city, optional: true
+  has_many :devices
+
+	# Validations
+  validates :dialing_prefix, presence: true, length: {minimum: 2, maximum: 4}
+	validates :mobile_number, presence: true, length: {minimum: 9, maximum: 11}
+	validates :status, :presence => true, :inclusion => {:in => STATUS.keys, :presence_of => :status, :message => "%{value} is not a valid status" }
+
+  # ------------------
+  # Class Methods
+  # ------------------
+
+  # return an active record relation object with the search query in its where clause
+  # Return the ActiveRecord::Relation object
+  # == Examples
+  #   >>> registration.search(query)
+  #   => ActiveRecord::Relation object
+  scope :search, lambda {|query| joins("INNER JOIN users on users.id = registrations.user_id").
+                                where("LOWER(mobile_number) LIKE LOWER('%#{query}%') OR 
+                                       LOWER(users.name) LIKE LOWER('%#{query}%')")}
+  scope :status, lambda { |status| where("LOWER(status)='#{status}'") }
+
+  scope :pending, -> { where(status: PENDING) }
+  scope :verified, -> { where(status: VERIFIED) }
+
+  # ------------------
+  # Instance Methods
+  # ------------------
+
+  # Status Methods
+  # --------------
+
+  # * Return true if the user is pending, else false.
+  # == Examples
+  #   >>> registration.pending?
+  #   => true
+  def pending?
+    (status == PENDING)
+  end
+
+  # * Return true if the user is not verified, else false.
+  # == Examples
+  #   >>> registration.verified?
+  #   => true
+  def verified?
+    (status == VERIFIED)
+  end
+
+  # change the status to :verified
+  # Return the status
+  # == Examples
+  #   >>> registration.pending!
+  #   => "pending"
+  def pending!
+    self.update_attribute(:status, PENDING)
+  end
+
+  # change the status to :verified
+  # Return the status
+  # == Examples
+  #   >>> registration.verify!
+  #   => "verified"
+  def verify!
+    self.update_attribute(:status, VERIFIED)
+  end
+
+  # Permission Methods
+  # ------------------
+
+  def can_be_edited?
+    pending?
+  end
+
+  def can_be_deleted?
+    pending?
+  end
+
+  # Other Methods
+  # -------------
+
+  # * Return mobile number with dialling prefix
+  # == Examples
+  #   >>> registration.display_name
+  #   => "+919880123456"
+  def display_name
+    "#{self.dialing_prefix} #{self.mobile_number}"
+  end
+	
+end

data/app/models/role.rb

@@ -18,20 +18,24 @@ class Role < Usman::ApplicationRecord
   scope :search, lambda {|query| where("LOWER(roles.name) LIKE LOWER('%#{query}%')")
                         }
 
-  def self.save_row_data(row)
+  def self.save_row_data(hsh)
 
-    row.headers.each{ |cell| row[cell] = row[cell].to_s.strip }
+    return if hsh[:name].blank?
 
-    return if row[:name].blank?
-
-    role = Role.find_by_name(row[:name]) || Role.new
-    role.name = row[:name]
+    role = Role.find_by_name(hsh[:name]) || Role.new
+    role.name = hsh[:name]
     
     # Initializing error hash for displaying all errors altogether
     error_object = Kuppayam::Importer::ErrorHash.new
 
     if role.valid?
-      role.save!
+      begin
+        role.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 role: #{role.name}"
       details = "Error! #{role.errors.full_messages.to_sentence}"

data/app/models/user.rb

@@ -39,6 +39,8 @@ class User < Usman::ApplicationRecord
   has_one :profile_picture, :as => :imageable, :dependent => :destroy, :class_name => "Image::ProfilePicture"
   has_many :permissions
   has_many :features, through: :permissions
+  has_many :devices
+  has_one :registration
   has_and_belongs_to_many :roles
 
   
@@ -70,29 +72,33 @@ class User < Usman::ApplicationRecord
 
   # Import Methods
 
-  def self.save_row_data(row)
+  def self.save_row_data(hsh)
 
-    row.headers.each{ |cell| row[cell] = row[cell].to_s.strip }
+    return if hsh[:name].blank?
 
-    return if row[:name].blank?
+    user = User.find_by_username(hsh[:username]) || User.new
+    user.name = hsh[:name]
+    user.username = hsh[:username]
+    user.designation = hsh[:designation]
+    user.email = hsh[:email]
+    user.phone = hsh[:phone]
 
-    user = User.find_by_username(row[:username]) || User.new
-    user.name = row[:name]
-    user.username = row[:username]
-    user.designation = row[:designation]
-    user.email = row[:email]
-    user.phone = row[:phone]
+    user.super_admin = ["true", "t","1","yes","y"].include?(hsh[:super_admin].to_s.downcase.strip)
 
-    user.super_admin = ["true", "t","1","yes","y"].include?(row[:super_admin].to_s.downcase.strip)
-
-    user.status = row[:status]
+    user.status = hsh[:status]
     user.assign_default_password
 
     # Initializing error hash for displaying all errors altogether
     error_object = Kuppayam::Importer::ErrorHash.new
 
     if user.valid?
-      user.save!
+      begin
+        user.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 user: #{user.name}"
       details = "Error! #{user.errors.full_messages.to_sentence}"

data/app/services/usman/mobile_registration_service.rb

@@ -0,0 +1,127 @@
+module Usman
+  class MobileRegistrationService
+
+    attr_reader :dialing_prefix, :mobile_number, 
+                :country, :city, 
+                :error_heading, :error_message, :error_details, 
+                :uuid, :device_token,
+                :device_name, :device_type,
+                :operating_system, :software_version,
+                :registration, :device, :remote_ip
+
+    def initialize(params)
+      @dialing_prefix = params[:dialing_prefix]
+      @mobile_number = params[:mobile_number]
+      
+      @country = Country.find_by_id(params[:country_id])
+      @city = City.find_by_id(params[:city_id])
+
+      # Edge case to catch city selected that of a different country
+      @city = nil unless @city.country == @country if @city
+      
+      @uuid = params[:uuid]
+      @device_token = params[:device_token]
+      @device_name = params[:device_name]
+      @device_type = params[:device_type]
+      @operating_system = params[:operating_system]
+      @software_version = params[:software_version]
+
+      @remote_ip = params[:remote_ip]
+      @error_message = nil
+      @error_details = {}
+
+      # @registration and @device will be initiated by the
+      # below method if the device is already registered
+      check_if_device_is_already_registered
+
+      register_new_device
+
+      # Validate the inputs
+      @registration.valid?
+      @device.valid?
+
+      if @registration.errors.any? or @device.errors.any?
+        errors = @registration.errors.to_hash.merge(@device.errors.to_hash)
+        set_error("mobile_registration.invalid_inputs", errors)
+      end
+
+    end
+
+    def check_if_device_is_already_registered
+      @registration = Registration.where("LOWER(mobile_number) = LOWER('#{@mobile_number}')").first
+      if @registration
+        @country = @registration.country unless @country
+        @city = @registration.city unless @city
+      end
+      @device = Device.where("LOWER(uuid) = LOWER('#{@uuid}')").first if @registration
+    end
+
+    def register_new_device
+      
+      if @device && @device.blocked?
+        set_error("mobile_registration.device_blocked")
+        return
+      end
+
+      ActiveRecord::Base.transaction do
+        # Create a new registration if it doesn't exist
+        @registration = Registration.new unless @registration
+        @registration.country = @country
+        @registration.city = @city
+        @registration.dialing_prefix = @dialing_prefix
+        @registration.mobile_number = @mobile_number
+        
+        # Create device entry if it doesn't exist
+        @device = Device.new unless @device
+        @device.registration = @registration
+        @device.user = @registration.user
+        @device.uuid = @uuid
+        @device.device_token = @device_token
+        @device.device_name = @device_name
+        @device.device_type = @device_type
+        @device.operating_system = @operating_system
+        @device.software_version = @software_version
+
+        @registration.valid?
+        @device.valid?
+
+        if @registration.errors.blank? && @device.errors.blank?
+          @registration.save
+          @device.save
+          generate_new_otp
+        else
+          raise ActiveRecord::Rollback 
+        end
+      end
+
+    end
+
+    def generate_new_otp
+      @device.generate_otp
+      if send_otp
+        @device.update_attribute(:otp_sent_at, Time.now)
+      else
+        set_error("mobile_registration.otp_not_sent")
+      end
+    end
+
+    def send_otp
+      return true
+    end
+
+    def set_error(key, hsh={})
+      @error_heading = I18n.t("#{key}.heading")
+      @error_message = I18n.t("#{key}.message")
+      @error_details = hsh if hsh.is_a?(Hash)
+    end
+
+    def errors
+      {
+        heading: @error_heading,
+        message: @error_message,
+        details: @error_details
+      }
+    end
+
+  end
+end

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

@@ -7,11 +7,11 @@
 			<!-- logo -->
 			<div class="logo">
 				<a href="/" class="logo-expanded">
-					<img src="/assets/kuppayam/logo.png" width="180" alt="" />
+					<img src="/assets/logo.png" width="180" alt="" />
 				</a>
 				
 				<a href="/" class="logo-collapsed">
-					<img src="/assets/kuppayam/logo.png" width="40" alt="" />
+					<img src="/assets/logo-small.png" width="40" alt="" />
 				</a>
 			</div>
 			
@@ -38,23 +38,43 @@
 			<!-- class "auto-inherit-active-class" will automatically add "active" class for parent elements who are marked already with class "active" -->
 			
 			<!-- Admin Dashboard -->
-			<li class="<%= nav_active?('admin/dashboard') ? 'active' : ''  %>">
-				<%= link_to raw("<i class=\"linecons-desktop\"></i> <span class='title'>Dashboard</span>"), usman.admin_dashboard_url %>
-			</li>
+			<% if @current_user.super_admin? || @current_user.has_role?("Site Admin") %>
+				<li class="<%= nav_active?('admin/dashboard') ? 'active' : ''  %>">
+					<%= link_to raw("<i class=\"linecons-desktop\"></i> <span class='title'>Dashboard</span>"), usman.dashboard_url %>
+				</li>
 
-			<li class="<%= nav_active?('admin/users') ? 'active' : ''  %>">
-				
-				<a href="#">
-					<i class="linecons-cog"></i>
-					<span class="title">Admin</span>
-				</a>
+				<li class="<%= nav_active?('admin/users') ? 'active' : ''  %>">
+					
+					<a href="#">
+						<i class="linecons-cog"></i>
+						<span class="title">Admin</span>
+					</a>
 
-				<ul>
-					<li class="<%= nav_class("admin/users") %>">
-				    <%= link_to raw("<i class=\"linecons-user\"></i> <span class='title'>Manage Users</span>"), usman.admin_users_url %>
-				  </li>
-				</ul>
-			</li>
+					<ul>
+						<li class="<%= nav_class("admin/users") %>">
+					    <%= link_to raw("<i class=\"linecons-user\"></i> <span class='title'>Manage Users</span>"), usman.users_url %>
+					  </li>
+					</ul>
+				</li>
+			<% else %>
+				<li class="<%= nav_active?('profile/dashboard') ? 'active' : ''  %>">
+				<%= link_to raw("<i class=\"linecons-desktop\"></i> <span class='title'>Dashboard</span>"), usman.my_account_url %>
+				</li>
+
+				<li class="<%= nav_active?('profile/profile') ? 'active' : ''  %>">
+					
+					<a href="#">
+						<i class="linecons-user"></i>
+						<span class="title">My Account</span>
+					</a>
+
+					<ul>
+						<li class="<%= nav_class("profile/settings") %>">
+					    <%= link_to raw("<i class=\"linecons-cog\"></i> <span class='title'>Settings</span>"), "#" %>
+					  </li>
+					</ul>
+				</li>
+			<% end %>
 
 			<% if @current_user.super_admin? %>
 			<li class="">
@@ -65,11 +85,11 @@
 
 				<ul>
 					<li class="">
-						<%= link_to raw("<i class=\"linecons-diamond\"></i> <span class='title'>Manage Features</span>"), usman.admin_features_url %>
+						<%= link_to raw("<i class=\"linecons-diamond\"></i> <span class='title'>Manage Features</span>"), usman.features_url %>
 					</li>
 
 					<li class="<%= nav_class("admin/users") %>">
-						<%= link_to raw("<i class=\"linecons-lock\"></i> <span class='title'>Manage Permissions</span>"), usman.admin_permissions_url %>
+						<%= link_to raw("<i class=\"linecons-lock\"></i> <span class='title'>Manage Permissions</span>"), usman.permissions_url %>
 					</li>
 				</ul>
 

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

@@ -0,0 +1,120 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <!-- Head -->
+    <%= render :partial=>"/layouts/kuppayam/head" -%>
+  </head>
+
+  <body class="page-body">
+
+    <!-- <div class="settings-pane" id="settings_pane">
+      <%#= render :partial=>"/layouts/kuppayam/settings_pane" -%>
+    </div> -->
+
+    <div class="page-container">
+      
+      <!-- Sidebar Navigation -->
+      <%= render :partial=>"/layouts/kuppayam/sidebar" -%>
+
+      <div class="main-content">
+
+        <!-- Top Navigation -->
+        <%= render :partial=>"/layouts/kuppayam/navbar" -%>
+
+        <!-- Heading & Breadcrumbs -->
+        <%= render :partial=>"/layouts/kuppayam/heading" -%>
+
+        <%#* Show flash messages if controller has set any. -%>
+        <div id="div_flash_message" class="mt-10">
+          <%= flash_message(false) if defined?(flash) -%>
+        </div>
+
+        <%#* Page Content Starts here -%>
+        <div id="div_page_content_main">
+          <%= yield %>
+        </div>
+
+        <!-- Footer -->
+        <%= render :partial=>"/layouts/kuppayam/footer" -%>
+
+      </div>
+
+    </div>
+
+    <div id="div_modal_generic" class="modal" style="z-index: 1056;">
+      <div class="modal-dialog">
+        <div class="modal-content">
+          <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+            <h3 class="modal-title">Modal title</h3>
+          </div>
+          <div class="modal-body-main"></div>
+        </div><!-- /.modal-content -->
+      </div><!-- /.modal-dialog -->
+    </div><!-- /.modal -->
+
+    <div id="div_modal_large" class="modal">
+      <div class="modal-dialog modal-lg" style="width: 96%">
+        <div class="modal-content">
+          <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+            <h3 class="modal-title">Modal title</h3>
+          </div>
+          <div class="modal-body-main"></div>
+        </div><!-- /.modal-content -->
+      </div><!-- /.modal-dialog -->
+    </div><!-- /.modal -->
+
+    <div id="div_modal_message" class="modal fade">
+      <div class="modal-dialog">
+        <div class="modal-content">
+          <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+            <h3 class="modal-title">Modal title</h3>
+          </div>
+          <div class="modal-body">
+            <p>One fine body&hellip;</p>
+          </div>
+          <div class="modal-footer">
+            <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
+          </div>
+        </div><!-- /.modal-content -->
+      </div><!-- /.modal-dialog -->
+    </div><!-- /.modal -->
+
+    <div id="div_modal_image_upload" class="modal" style="z-index: 1057;">
+      <div class="modal-dialog">
+        <div class="modal-content">
+          <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+            <h3 class="modal-title">Modal title</h3>
+          </div>
+          <div class="modal-body-main"></div>
+        </div><!-- /.modal-content -->
+      </div><!-- /.modal-dialog -->
+    </div><!-- /.modal -->
+
+    <script type="text/javascript">
+      $('.modal').on('shown.bs.modal', function(e){
+        $(this).modal('handleUpdate'); //Update backdrop on modal show
+        $(this).scrollTop(0); //reset modal to top position
+      });
+    </script>
+
+    <!-- Page Loading Overlay -->
+    <!-- <div class="page-loading-overlay">
+      <div class="loader-3"></div>
+    </div> -->
+
+    <%#* Loading Javascripts -%>
+    <%= javascript_include_tag @javascript_filename -%>
+
+    <%= yield :javascript_footer -%>
+
+    <iframe id="iframe_document" name="iframe_document" width="100%" style="display:none"></iframe>
+
+    <iframe id="iframe_image" name="iframe_image" width="100%" style="display:none"></iframe>
+
+  </body>
+
+</html>

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

@@ -0,0 +1,118 @@
+<%
+	items = {
+		users: {
+			counts: {
+				total: User.normal_users.count,
+				approved: User.normal_users.approved.count,
+				pending: User.normal_users.pending.count,
+				suspended: User.normal_users.suspended.count
+			},
+			text: "Users",
+			icon_class: "fa-user",
+			url: usman.users_url
+		}
+	}
+%>
+
+<h3 class="text-gray mt-50 mb-10">
+	Admin <br>
+	<small class="text-muted">Manage Users and much more...</small>
+</h3>
+<hr class="mb-30" style="border-top:1px solid #ddd;">
+
+<div class="row">
+
+	<% items.each do |key, values| %>
+	<div class="col-lg-4 col-md-4 col-sm-6 col-xs-12">
+		
+		<div class="xe-widget xe-vertical-counter xe-vertical-counter-white" data-count=".num" data-from="0" data-to="128" data-duration="4">
+			<div class="xe-icon">
+				<i class="<%= values[:icon_class] %>"></i>
+			</div>
+			
+			<div class="xe-label">
+				<strong class="num"><%= values[:text] %></strong>
+			</div>
+
+			<div class="xe-label" style="margin-top:10px; margin-bottom: 10px;height: 100px; overflow-y: auto;">
+				<% values[:counts].each do |count_text, count_value| %>
+				<span><%= count_text.to_s.titleize %>: <strong><%= count_value %></strong></span>
+				<% end %>
+			</div>
+
+			<div class="xe-label">
+				<span><%= link_to("Manage", values[:url], class: "btn btn-sm btn-primary btn-block") %></span>
+			</div>
+		</div>
+		
+	</div>
+	<% end %>
+</div>
+
+<% if @current_user.super_admin? %>
+	<%
+		items = {
+			features: {
+				counts: {
+					total: Feature.published.count
+				},
+				text: "Features",
+				icon_class: "linecons-diamond",
+				url: usman.features_url
+			},
+			roles: {
+				counts: {
+					total: Role.count
+				},
+				text: "Roles",
+				icon_class: "linecons-graduation-cap",
+				url: usman.roles_url
+			},
+			permissions: {
+				counts: {
+					total: Permission.count
+				},
+				text: "Permissions",
+				icon_class: "fa-lock",
+				url: usman.permissions_url
+			},
+			
+		}
+	%>
+
+	<h3 class="text-gray mt-50 mb-10">
+		Super Admin <br>
+		<small class="text-muted">Manage Features, Permissions and other super admin modules</small>
+	</h3>
+	<hr class="mb-30" style="border-top:1px solid #ddd;">
+
+	<div class="row">
+
+		<% items.each do |key, values| %>
+		<div class="col-lg-4 col-md-4 col-sm-6 col-xs-12">
+			
+			<div class="xe-widget xe-vertical-counter xe-vertical-counter-white" data-count=".num" data-from="0" data-to="128" data-duration="4">
+				<div class="xe-icon">
+					<i class="<%= values[:icon_class] %>"></i>
+				</div>
+				
+				<div class="xe-label">
+					<strong class="num"><%= values[:text] %></strong>
+				</div>
+
+				<div class="xe-label" style="margin-top:10px; margin-bottom: 10px;height: 100px; overflow-y: auto;">
+					<% values[:counts].each do |count_text, count_value| %>
+					<span><%= count_text.to_s.titleize %>: <strong><%= count_value %></strong></span>
+					<% end %>
+				</div>
+
+				<div class="xe-label">
+					<span><%= link_to("Manage", values[:url], class: "btn btn-sm btn-primary btn-block") %></span>
+				</div>
+			</div>
+			
+		</div>
+		<% end %>
+		
+	</div>
+<% end %>

data/app/views/usman/{admin/features → features}/_form.html.erb

@@ -1,4 +1,4 @@
-<%= form_for([:admin, @feature], :html => {:id=>"form_feature", :class=>"mb-0 form-horizontal", :role => "form", :method => (@feature.new_record? ? :post : :put), :remote=>true}) do |f| %>
+<%= form_for([@feature], :html => {:id=>"form_feature", :class=>"mb-0 form-horizontal", :role => "form", :method => (@feature.new_record? ? :post : :put), :remote=>true}) do |f| %>
 
       <div id="feature_form_error">
         <%= @feature.errors[:base].to_sentence %>