usman 0.1.6dev2 → 0.2.0

data/config/locales/usman/mobile_registration.en.yml

@@ -0,0 +1,14 @@
+en:
+  mobile_registration:
+    device_blocked:
+      heading: "This device is blocked."
+      message: "You must have done some mal-practices."
+    invalid_inputs:
+      heading: "Registring new mobile number FAILED."
+      message: "Check if all mandatory details are passed. Refer the error details for technical information."
+    otp_sent:
+      heading: "An OTP has been sent to you"
+      message: "Check your mobile for new message from us."
+    otp_not_sent:
+      heading: "OTP was not sent"
+      message: "There was some technical glitch and OTP was not sent. Try after some time."  

data/config/routes.rb

@@ -11,32 +11,36 @@ Usman::Engine.routes.draw do
   # Logout Url
   delete  '/sign_out' ,               to: "sessions#sign_out",  as:  :sign_out
 
-  namespace :admin do
-
-    get   '/dashboard',         to: "dashboard#index",  as:   :dashboard
-    
-    resources :users do
-      member do
-        put :masquerade, as: :masquerade
-        put :update_status, as:  :update_status
-        put :make_super_admin, as:  :make_super_admin
-        put :remove_super_admin, as:  :remove_super_admin
-      end
+  get   '/my_account',        to: "my_account#index",  as:   :my_account
+  get   '/dashboard/usman',   to: "dashboard#index",  as:   :dashboard
+  
+  resources :users do
+    member do
+      put :masquerade, as: :masquerade
+      put :update_status, as:  :update_status
+      put :make_super_admin, as:  :make_super_admin
+      put :remove_super_admin, as:  :remove_super_admin
     end
+  end
 
-    resources :roles do
-      resources :users, :controller => "user_roles"
-    end
+  resources :roles do
+    resources :users, :controller => "user_roles"
+  end
 
-    resources :features do
-      member do
-        put :update_status, as:  :update_status
-      end
+  resources :features do
+    member do
+      put :update_status, as:  :update_status
     end
+  end
 
-    resources :permissions
-    
+  resources :permissions
 
-   end
+  namespace :api do
+    namespace :v1 do
+      post :register, :controller => "/api/v1/registrations"
+      #post :resend_otp, :controller => "/api/v1/registrations"
+      #post :verify, :controller => "/api/v1/registrations"
+    end
+  end
 
 end

data/db/master_data/roles.csv

@@ -0,0 +1,2 @@
+name
+Site Admin

data/db/migrate/{20170728095744_create_otp_registrations.rb → 20170819113217_create_registrations.rb}

@@ -1,14 +1,14 @@
-class CreateOtpRegistrations < ActiveRecord::Migration[5.1]
+class CreateRegistrations < ActiveRecord::Migration[5.1]
   def change
-    create_table :otp_registrations do |t|
+    create_table :registrations do |t|
 
       t.references :user, index: true
       t.references :country, index: true
+      t.references :city, index: true
       
+      t.string :dialing_prefix
       t.string :mobile_number
       
-      t.integer :otp
-      t.datetime :otp_sent_at
       t.string :status, :null => false, :default=>"pending", :limit=>16
       
       t.timestamps

data/db/migrate/20170819113218_add_registration_id_to_users.rb

@@ -0,0 +1,7 @@
+class AddRegistrationIdToUsers < ActiveRecord::Migration[5.0]
+  def change
+    def change
+      add_reference :users, :registration, foreign_key: true
+    end
+  end
+end

data/db/migrate/20170819113219_create_devices.rb

@@ -0,0 +1,41 @@
+class CreateDevices < ActiveRecord::Migration[5.1]
+  def change
+    create_table :devices do |t|
+
+      t.references :user, index: true
+      t.references :registration, index: true
+      
+      t.string :uuid, limit: 1024
+      t.string :device_token, limit: 1024
+
+      # Apple iPhone, Samsung Note
+      t.string :device_name, limit: 64
+
+      # iPhone 7 Plus, Note 6
+      t.string :device_type, limit: 64
+
+      # Jelly Beans / Lollypop
+      t.string :operating_system, limit: 64
+
+      # iOS version / Android version
+      t.string :software_version, limit: 64
+      
+      # Know what was the last API accessed and when
+      # This is to catch the users who are inactive
+      t.datetime :last_accessed_at
+      t.string :last_accessed_api, limit: 1024
+
+      # One Time Password
+      t.integer :otp
+      t.datetime :otp_sent_at
+
+      # API token
+      t.string :api_token, limit: 256
+      t.datetime :token_created_at, default: nil
+      
+      t.string :status, :null => false, :default=>"pending", :limit=>16
+      
+      t.timestamps
+    end
+  end
+end

data/lib/tasks/usman/data.rake

@@ -0,0 +1,85 @@
+require 'csv'
+require 'open-uri'
+require 'time'
+
+namespace 'usman' do
+  namespace 'import' do
+    namespace 'data' do
+
+      desc "Import all data in sequence"
+      task 'all' => :environment do
+
+        import_list = ["users", "features", "permissions", "roles"]
+        
+        import_list.each do |item|
+          print "Importing #{item.titleize} \t".yellow
+          begin
+            Rake::Task["usman:import:data:#{item}"].invoke
+          rescue ArgumentError => e
+              puts "Loading #{item} - Failed - #{e.message}".red
+          rescue Exception => e
+            puts "Importing #{item.titleize} - Failed - #{e.message}".red
+            puts "Backtrace:\n\t#{e.backtrace.join("\n\t")}"
+          end
+        end
+        puts " "
+      end
+
+      ["Feature", "User", "Role", "Permission"].each do |cls_name|
+        name = cls_name.underscore.pluralize
+        desc "Import #{cls_name.pluralize}"
+        task name => :environment do
+          verbose = true
+          verbose = false if ["false", "f","0","no","n"].include?(ENV["verbose"].to_s.downcase.strip)
+          
+          path = Rails.root.join('db', 'data', "#{cls_name.constantize.table_name}.csv")
+          path = Usman::Engine.root.join('db', 'data', 'dummy', "#{cls_name.constantize.table_name}.csv") unless File.exists?(path)
+          
+          cls_name.constantize.destroy_all
+          cls_name.constantize.import_data_file(path, true, verbose)
+          # puts "Importing Completed".green if verbose
+        end
+      end
+
+      namespace 'dummy' do
+        
+        desc "Import all dummy data in sequence"
+        task 'all' => :environment do
+
+          import_list = ["users", "features", "permissions", "roles"]
+          
+          import_list.each do |item|
+            print "Loading #{item.split(':').last.titleize} \t".yellow
+            begin
+              Rake::Task["usman:import:data:dummy:#{item}"].invoke
+            rescue ArgumentError => e
+              puts "Loading #{item} - Failed - #{e.message}".red
+            rescue Exception => e
+              puts "Loading #{item} - Failed - #{e.message}".red
+              puts "Backtrace:\n\t#{e.backtrace.join("\n\t")}"
+            end
+          end
+          puts " "
+        end
+
+        ["Feature", "User", "Role", "Permission"].each do |cls_name|
+          name = cls_name.underscore.pluralize
+          desc "Load Dummy #{cls_name.pluralize}"
+          task name => :environment do
+            verbose = true
+            verbose = false if ["false", "f","0","no","n"].include?(ENV["verbose"].to_s.downcase.strip)
+            
+            path = Rails.root.join('db', 'data', 'dummy', "#{cls_name.constantize.table_name}.csv")
+            path = Usman::Engine.root.join('db', 'data', 'dummy', "#{cls_name.constantize.table_name}.csv") unless File.exists?(path)
+
+            cls_name.constantize.destroy_all
+            cls_name.constantize.import_data_file(path, true, verbose)
+            # puts "Importing Completed".green if verbose
+          end
+        end
+      end
+
+    end
+  end
+end
+    

data/lib/tasks/usman/master_data.rake

@@ -0,0 +1,44 @@
+require 'csv'
+require 'open-uri'
+require 'time'
+
+namespace 'usman' do
+  namespace 'import' do
+    namespace 'master_data' do
+
+      desc "Import all data in sequence"
+      task 'all' => :environment do
+
+        import_list = ["roles"]
+        
+        import_list.each do |item|
+          print "Importing #{item.titleize} \t".yellow
+          begin
+            Rake::Task["usman:import:master_data:#{item}"].invoke
+          rescue ArgumentError => e
+              puts "Loading #{item} - Failed - #{e.message}".red
+          rescue Exception => e
+            puts "Importing #{item.titleize} - Failed - #{e.message}".red
+            puts "Backtrace:\n\t#{e.backtrace.join("\n\t")}"
+          end
+        end
+        puts " "
+      end
+
+      ["Role"].each do |cls_name|
+        name = cls_name.underscore.pluralize
+        desc "Import #{cls_name.pluralize}"
+        task name => :environment do
+          verbose = true
+          verbose = false if ["false", "f","0","no","n"].include?(ENV["verbose"].to_s.downcase.strip)
+          path = Usman::Engine.root.join('db', 'master_data', "#{cls_name.constantize.table_name}.csv")
+          cls_name.constantize.destroy_all
+          cls_name.constantize.import_data_file(path, true, verbose)
+          # puts "Importing Completed".green if verbose
+        end
+      end
+
+    end
+  end
+end
+    

data/lib/usman/engine.rb

@@ -1,11 +1,12 @@
 module Usman
   class Engine < ::Rails::Engine
     
+    # require 'pry'
     require 'kaminari'
     require 'kuppayam'
+    require 'pattana'
     require 'colorize'
     require 'colorized_string'
-    require 'pry'
     
     isolate_namespace Usman
 

data/lib/usman/version.rb

@@ -1,3 +1,3 @@
 module Usman
-  VERSION = '0.1.6dev2'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usman
 version: !ruby/object:Gem::Version
-  version: 0.1.6dev2
+  version: 0.2.0
 platform: ruby
 authors:
 - kpvarma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-19 00:00:00.000000000 Z
+date: 2017-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -90,14 +90,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5dev4
+        version: 0.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5dev4
+        version: 0.1.7
+- !ruby/object:Gem::Dependency
+  name: pattana
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
@@ -300,28 +314,66 @@ files:
 - README.md
 - Rakefile
 - app/assets/config/usman_manifest.js
-- app/controllers/usman/admin/base_controller.rb
-- app/controllers/usman/admin/dashboard_controller.rb
-- app/controllers/usman/admin/features_controller.rb
-- app/controllers/usman/admin/permissions_controller.rb
-- app/controllers/usman/admin/resource_controller.rb
-- app/controllers/usman/admin/roles_controller.rb
-- app/controllers/usman/admin/user_roles_controller.rb
-- app/controllers/usman/admin/users_controller.rb
+- app/assets/images/android-icon-144x144.png
+- app/assets/images/android-icon-192x192.png
+- app/assets/images/android-icon-36x36.png
+- app/assets/images/android-icon-48x48.png
+- app/assets/images/android-icon-72x72.png
+- app/assets/images/android-icon-96x96.png
+- app/assets/images/apple-icon-114x114.png
+- app/assets/images/apple-icon-120x120.png
+- app/assets/images/apple-icon-144x144.png
+- app/assets/images/apple-icon-152x152.png
+- app/assets/images/apple-icon-180x180.png
+- app/assets/images/apple-icon-57x57.png
+- app/assets/images/apple-icon-60x60.png
+- app/assets/images/apple-icon-72x72.png
+- app/assets/images/apple-icon-76x76.png
+- app/assets/images/apple-icon-precomposed.png
+- app/assets/images/apple-icon.png
+- app/assets/images/browserconfig.xml
+- app/assets/images/favicon-16x16.png
+- app/assets/images/favicon-32x32.png
+- app/assets/images/favicon-96x96.png
+- app/assets/images/favicon.ico
+- app/assets/images/logo-on-white.png
+- app/assets/images/logo-small.png
+- app/assets/images/logo.png
+- app/assets/images/manifest.json
+- app/assets/images/ms-icon-144x144.png
+- app/assets/images/ms-icon-150x150.png
+- app/assets/images/ms-icon-310x310.png
+- app/assets/images/ms-icon-70x70.png
+- app/assets/sketches/logo.sketch
+- app/controllers/api/v1/base_controller.rb
+- app/controllers/api/v1/registrations_controller.rb
+- app/controllers/usman/admin_controller.rb
 - app/controllers/usman/application_controller.rb
+- app/controllers/usman/dashboard_controller.rb
+- app/controllers/usman/features_controller.rb
+- app/controllers/usman/my_account_controller.rb
+- app/controllers/usman/permissions_controller.rb
+- app/controllers/usman/resource_controller.rb
+- app/controllers/usman/roles_controller.rb
 - app/controllers/usman/sessions_controller.rb
+- app/controllers/usman/user_roles_controller.rb
+- app/controllers/usman/users_controller.rb
+- app/helpers/usman/api_helper.rb
 - app/helpers/usman/application_helper.rb
 - app/helpers/usman/authentication_helper.rb
 - app/jobs/usman/application_job.rb
 - app/mailers/usman/application_mailer.rb
+- app/models/device.rb
 - app/models/feature.rb
 - app/models/image/feature_image.rb
 - app/models/image/profile_picture.rb
 - app/models/permission.rb
+- app/models/registration.rb
 - app/models/role.rb
 - app/models/user.rb
 - app/models/usman/application_record.rb
 - app/services/usman/authentication_service.rb
+- app/services/usman/mobile_registration_service.rb
 - app/uploaders/feature_image_uploader.rb
 - app/uploaders/image_uploader.rb
 - app/uploaders/profile_picture_uploader.rb
@@ -329,51 +381,58 @@ files:
 - app/views/layouts/kuppayam/_header.html.erb
 - app/views/layouts/kuppayam/_navbar.html.erb
 - app/views/layouts/kuppayam/_sidebar.html.erb
-- app/views/usman/admin/dashboard/index.html.erb
-- app/views/usman/admin/features/_form.html.erb
-- app/views/usman/admin/features/_index.html.erb
-- app/views/usman/admin/features/_row.html.erb
-- app/views/usman/admin/features/_show.html.erb
-- app/views/usman/admin/features/index.html.erb
-- app/views/usman/admin/permissions/_action_buttons.html.erb
-- app/views/usman/admin/permissions/_form.html.erb
-- app/views/usman/admin/permissions/_index.html.erb
-- app/views/usman/admin/permissions/_row.html.erb
-- app/views/usman/admin/permissions/_show.html.erb
-- app/views/usman/admin/permissions/index.html.erb
-- app/views/usman/admin/roles/_form.html.erb
-- app/views/usman/admin/roles/_index.html.erb
-- app/views/usman/admin/roles/_row.html.erb
-- app/views/usman/admin/roles/_show.html.erb
-- app/views/usman/admin/roles/index.html.erb
-- app/views/usman/admin/user_roles/_form.html.erb
-- app/views/usman/admin/user_roles/_index.html.erb
-- app/views/usman/admin/user_roles/_row.html.erb
-- app/views/usman/admin/users/_form.html.erb
-- app/views/usman/admin/users/_index.html.erb
-- app/views/usman/admin/users/_row.html.erb
-- app/views/usman/admin/users/_show.html.erb
-- app/views/usman/admin/users/index.html.erb
+- app/views/layouts/kuppayam/profile.html.erb
+- app/views/usman/dashboard/index.html.erb
+- app/views/usman/features/_form.html.erb
+- app/views/usman/features/_index.html.erb
+- app/views/usman/features/_row.html.erb
+- app/views/usman/features/_show.html.erb
+- app/views/usman/features/index.html.erb
+- app/views/usman/my_account/index.html.erb
+- app/views/usman/permissions/_action_buttons.html.erb
+- app/views/usman/permissions/_form.html.erb
+- app/views/usman/permissions/_index.html.erb
+- app/views/usman/permissions/_row.html.erb
+- app/views/usman/permissions/_show.html.erb
+- app/views/usman/permissions/index.html.erb
+- app/views/usman/roles/_form.html.erb
+- app/views/usman/roles/_index.html.erb
+- app/views/usman/roles/_row.html.erb
+- app/views/usman/roles/_show.html.erb
+- app/views/usman/roles/index.html.erb
 - app/views/usman/sessions/_form.html.erb
 - app/views/usman/sessions/_sign_in.js.erb
 - app/views/usman/sessions/sign_in.html.erb
-- config/initializers/overide_kuppayam_controllers.rb
-- config/locales/kuppayam/authentication.ar.yml
-- config/locales/kuppayam/authentication.en.yml
+- app/views/usman/user_roles/_form.html.erb
+- app/views/usman/user_roles/_index.html.erb
+- app/views/usman/user_roles/_row.html.erb
+- app/views/usman/users/_form.html.erb
+- app/views/usman/users/_index.html.erb
+- app/views/usman/users/_row.html.erb
+- app/views/usman/users/_show.html.erb
+- app/views/usman/users/index.html.erb
+- config/locales/usman/authentication.ar.yml
+- config/locales/usman/authentication.en.yml
+- config/locales/usman/mobile_registration.ar.yml
+- config/locales/usman/mobile_registration.en.yml
 - config/routes.rb
-- db/import_data/dummy/features.csv
-- db/import_data/dummy/permissions.csv
-- db/import_data/dummy/roles.csv
-- db/import_data/dummy/users.csv
-- db/import_data/features.csv
-- db/import_data/permissions.csv
-- db/import_data/roles.csv
-- db/import_data/users.csv
+- db/data/dummy/features.csv
+- db/data/dummy/permissions.csv
+- db/data/dummy/roles.csv
+- db/data/dummy/users.csv
+- db/data/features.csv
+- db/data/permissions.csv
+- db/data/roles.csv
+- db/data/users.csv
+- db/master_data/roles.csv
 - db/migrate/20170000000100_create_users.rb
 - db/migrate/20170000000101_create_features.rb
 - db/migrate/20170000000102_create_roles.rb
-- db/migrate/20170728095744_create_otp_registrations.rb
-- lib/tasks/usman/all.rake
+- db/migrate/20170819113217_create_registrations.rb
+- db/migrate/20170819113218_add_registration_id_to_users.rb
+- db/migrate/20170819113219_create_devices.rb
+- lib/tasks/usman/data.rake
+- lib/tasks/usman/master_data.rake
 - lib/temp/features.rake
 - lib/temp/permissions.rake
 - lib/temp/roles.rake
@@ -396,9 +455,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.11

data/app/controllers/usman/admin/base_controller.rb

@@ -1,46 +0,0 @@
-module Usman
-  module Admin
-    class BaseController < ApplicationController
-      
-      layout 'kuppayam/admin'
-      
-      before_action :require_user
-      before_action :require_site_admin
-      
-      private
-
-      def set_default_title
-        set_title("Usman Admin | User Management Module")
-      end
-
-      def require_site_admin
-        return true if @current_user && @current_user.super_admin?
-        unless @current_user && @current_user.has_role?("Site Admin")
-          respond_to do |format|
-            format.html {
-              #text = "#{I18n.t("authentication.permission_denied.heading")}: #{I18n.t("authentication.permission_denied.message")}"
-              #set_flash_message(text, :error, false) if defined?(flash) && flash
-              redirect_after_unsuccessful_authentication
-            }
-            format.js {
-              @params_hsh = {}
-              @params_hsh[:client_app] = params[:client_app] if params[:client_app]
-              @params_hsh[:redirect_back_url] = params[:redirect_back_url] if params[:redirect_back_url]
-              @params_hsh[:requested_url] = request.original_url if request.get?
-              
-              render(:partial => 'usman/sessions/sign_in.js.erb', :handlers => [:erb], :formats => [:js])
-            }
-          end
-        end
-      end
-
-      def configure_filter_param_mapping
-        @filter_param_mapping = default_filter_param_mapping
-        @filter_param_mapping[:super_admin] = :sa
-        @filter_param_mapping[:user] = :us
-        @filter_param_mapping[:feature] = :ft
-      end
-      
-    end	
-  end
-end

data/app/controllers/usman/admin/dashboard_controller.rb

@@ -1,26 +0,0 @@
-module Usman
-	module Admin
-	  class DashboardController < Usman::Admin::BaseController
-
-	  	# GET /dashboard
-	    def index
-	    end
-
-	    private
-
-	    def breadcrumbs_configuration
-	      {
-	        heading: "User Dashboard",
-	        description: "A Quick view of users and roles",
-	        links: [{name: "Dashboard", link: admin_dashboard_path, icon: 'fa-dashboard'}]
-	      }
-	    end
-
-	    def set_navs
-	      set_nav("admin/dashboard")
-	    end
-
-	  end
-	end
-end
-