wordjelly-auth 1.2.5 → 1.2.6

data/app/models/auth/shopping/personality.rb

@@ -1,3 +1,12 @@
 class Auth::Shopping::Personality
+	
 	include Auth::Concerns::Shopping::PersonalityConcern
+
+	FIXED_FIELD_OPTIONS = {
+		:sex => ["Male","Female"]
+	}
+
+
+	
+
 end

data/app/models/auth/work/bullet.rb

@@ -1,6 +1,8 @@
 class Auth::Work::Bullet
 	include Mongoid::Document
-	include Auth::Concerns::ChiefModelConcern
+	include Mongoid::Timestamps
+	include Auth::Concerns::ImageLoadConcern
+	
 	embedded_in :instruction, :class_name => "Auth::Work::Instruction"
 	field :title, type: String
 	field :description, type: String

data/app/models/auth/work/communication.rb

@@ -1,5 +1,7 @@
 class Auth::Work::Communication
-	include Auth::Concerns::ChiefModelConcern
+	include Mongoid::Document
+	include Mongoid::Timestamps
+	include Auth::Concerns::ImageLoadConcern
 	###################################################################
 	##
 	##

data/app/models/auth/work/instruction.rb

@@ -1,7 +1,8 @@
 class Auth::Work::Instruction
 	include Mongoid::Document
-	include Auth::Concerns::ChiefModelConcern
+	include Mongoid::Timestamps
 	include Auth::Concerns::Work::CommunicationFieldsConcern
+	include Auth::Concerns::ImageLoadConcern
 	
 	attr_accessor :product_id
 	attr_accessor :cart_item_id

data/app/models/auth/work/link.rb

@@ -1,5 +1,7 @@
 class Auth::Work::Link
-	include Auth::Concerns::ChiefModelConcern
+	include Mongoid::Document
+	include Mongoid::Timestamps
+	include Auth::Concerns::ImageLoadConcern
 	embedded_in :instruction, :class_name => "Auth::Work::Instruction"
 	field :url, type: String
 	field :url_text, type: String

data/app/views/auth/search/_search_bar.html.erb

@@ -1,8 +1,13 @@
-<form autocomplete="off">
-      <div class="input-field">
-        <input id="search" type="search" required>
-        <label class="label-icon" for="search"><i class="material-icons">search</i></label>
-        <i class="material-icons">close</i>
-      </div>
-</form>
+<div class="row" style="margin-bottom:1.4rem;">
+<ul class="collection with-header" id="search_collection">
+	<li class="collection-header" id="search_title">
+		<h4>
+			<div class="input-field">
+				<input id="search" type="search" placeholder="Search" required>
+				<i class="material-icons">close</i>
+			</div>
+		</h4>
+	</li>
+</ul>
+</div>
 

data/app/views/auth/search/_search_result.html.erb

@@ -1,7 +1,21 @@
-<div class="row m-0-top">
-  <div class="col l6 m6 s6 offset-l3 search-results">
-    <div class="card p-10-top p-10-bottom p-10-left p-10-right">
-        hi there
-    </div>
-  </div>
-</div>
+<li class="collection-item search_result teal-text">
+<%= link_to result.primary_link.html_safe do %>
+	<h5><%= result.tags.join(" ") %></h5>
+<% end %>
+<h6 class="grey-text"><%= result.autocomplete_description %></h6>
+<% result.secondary_links.keys.each do |sl| %>
+	<% if result.secondary_links[sl][:partial] %>
+		<% locals = {} %>
+		<% other_locals = result.secondary_links[sl] || {} %> 
+		<% locals = locals.merge(other_locals) %>
+		<% if result.secondary_links[sl][:instance_name_in_locals] %>
+			<% locals = locals.merge(result.secondary_links[sl][:instance_name_in_locals].to_sym => result) %>
+		<% end %>
+		<%= render :partial => result.secondary_links[sl][:partial], locals: locals %>
+	<% else %>
+		<%= link_to result.secondary_links[sl][:url].html_safe, :data => result.secondary_links[sl][:data] || {} do %>
+			<span class="m-20-right"><%= sl %></span>
+		<% end %>
+	<% end %>
+<% end %>
+</li>

data/app/views/auth/search/authenticated_user_search.js.erb

@@ -1,19 +1,12 @@
-<% @search_results.each do |result|
-	_partial = "auth/search/search_result.html.erb"
-	search_path = Auth::OmniAuth::Path.model_to_path(result.class) + "/_search_result.html.erb"
-	if lookup_context.find_all(search_path).any?
-		puts "found in lookup context."
-		_partial = search_path			
-	end
-	_partial = _partial.gsub(/\/_search/,"/search")
-	puts "partial is: #{_partial}"
-%>
+$(".search_result").remove();
+<% @search_results.each do |result| %>
 	
-	
-	$("#navbar_search_results").append("<%= escape_javascript render :partial => _partial, locals: {result: result, resource: lookup_resource} %>")
+	<% if result %>
+		
+		$("#search_collection").append("<%= escape_javascript(render :partial => 'auth/search/search_result', locals: {result: result}) %>");
+	<% end %>
 
-<%
+<% end %>
 
-end
+highlight();
 
-%>

data/app/views/auth/search/authenticated_user_search.json

@@ -1,7 +1,7 @@
 <%= 
 
 updated_array = @search_results.map do |k|
-		k = k.as_json.merge({:_type => k._type})
+		k = k.as_json({}).merge({:_type => k._type})
 end
 
 updated_array.to_json.html_safe %>

data/app/views/layouts/auth/application.html.erb

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Hi Bitch</title>
+  <title>Auth</title>
   <%= stylesheet_link_tag    "auth/application", media: "all" %>
   <%= javascript_include_tag "auth/application" %>
   <%= csrf_meta_tags %>

data/app/views/layouts/auth/navbar/_navbar.html.erb

@@ -8,13 +8,10 @@
             <%= content_for(:navbar_left)  %>
           <% else %>
             <a href="/" class="brand-logo"><%= Auth.configuration.brand_name %></a>
-            <%= render :partial => 'layouts/auth/navbar/progress_spinner.html.erb' %>
+            
           <% end %>
         </div>
-        <div class="nav-wrapper col l4 m4 s4 offset-l3 offset-m3 offset-s3 hide-on-med-and-down">
-          <%= render :partial => 'auth/search/search_bar.html.erb' %>  
-        </div>
-
+      
         <a href="#" data-target="mobile-demo" class="sidenav-trigger"><i class="material-icons">menu</i></a>
         <ul class="right hide-on-med-and-down">
           <% if content_for?(:navbar_right) %>
@@ -41,6 +38,9 @@
  <% else %>
   <div id="proxy_user"></div>
  <% end %>
+  <div class="progress" id="progress" style="margin-top:5px !important; visibility:hidden;">
+      <div class="indeterminate" style="width: 100%"></div>
+  </div>
 </div>
 
 

data/config/initializers/omniauth.rb

@@ -412,10 +412,7 @@ module SimpleTokenAuthentication
 
 		## CHANGE THE AUTHENTICATION TOKEN WHENEVER THE USER IS SAVED. IT DOESNT MATTER IF THERE IS AN EXISTING AUTHENTICATION TOKEN OR NOT.
 	    def ensure_authentication_token
-	      #if authentication_token.blank?
-	      #puts "------------------CAME TO ENSURE AUTHENTICATION TOKEN--------------------"
 	      regenerate_token
-	      #end
 	    end
 	end
 

data/lib/assets/javascripts/bar_code.js

@@ -0,0 +1,97 @@
+var _scannerIsRunning = false;
+
+function startScanner() {
+    Quagga.init({
+        inputStream: {
+            name: "Live",
+            type: "LiveStream",
+            target: document.querySelector('#scanner-container'),
+            constraints: {
+                width: 480,
+                height: 320,
+                facingMode: "environment"
+            },
+        },
+        decoder: {
+            readers: [
+                "code_128_reader",
+                "ean_reader",
+                "ean_8_reader",
+                "code_39_reader",
+                "code_39_vin_reader",
+                "codabar_reader",
+                "upc_reader",
+                "upc_e_reader",
+                "i2of5_reader"
+            ],
+            debug: {
+                showCanvas: true,
+                showPatches: true,
+                showFoundPatches: true,
+                showSkeleton: true,
+                showLabels: true,
+                showPatchLabels: true,
+                showRemainingPatchLabels: true,
+                boxFromPatches: {
+                    showTransformed: true,
+                    showTransformedBox: true,
+                    showBB: true
+                }
+            }
+        },
+
+    }, function (err) {
+        if (err) {
+            console.log(err);
+            return
+        }
+
+        console.log("Initialization finished. Ready to start");
+        Quagga.start();
+
+        // Set flag to is running
+        _scannerIsRunning = true;
+    });
+
+    Quagga.onProcessed(function (result) {
+        var drawingCtx = Quagga.canvas.ctx.overlay,
+        drawingCanvas = Quagga.canvas.dom.overlay;
+
+        if (result) {
+            if (result.boxes) {
+                drawingCtx.clearRect(0, 0, parseInt(drawingCanvas.getAttribute("width")), parseInt(drawingCanvas.getAttribute("height")));
+                result.boxes.filter(function (box) {
+                    return box !== result.box;
+                }).forEach(function (box) {
+                    Quagga.ImageDebug.drawPath(box, { x: 0, y: 1 }, drawingCtx, { color: "green", lineWidth: 2 });
+                });
+            }
+
+            if (result.box) {
+                Quagga.ImageDebug.drawPath(result.box, { x: 0, y: 1 }, drawingCtx, { color: "#00F", lineWidth: 2 });
+            }
+
+            if (result.codeResult && result.codeResult.code) {
+                Quagga.ImageDebug.drawPath(result.line, { x: 'x', y: 'y' }, drawingCtx, { color: 'red', lineWidth: 3 });
+            }
+        }
+    });
+
+    Quagga.onDetected(function (result) {
+        console.log("Barcode detected and processed : [" + result.codeResult.code + "]", result);
+    });
+}
+
+// Start/stop scanner
+document.getElementById("btn").addEventListener("click", function () {
+    if (_scannerIsRunning) {
+        Quagga.stop();
+    } else {
+        if(typeof Quagga === 'undefined'){
+            console.log("Please add the Quagga js library to use the barcode api");
+        }
+        else{
+            startScanner();
+        }
+    }
+}, false);

data/lib/assets/javascripts/search.js

@@ -6,7 +6,7 @@ function navbar_search(query_string){
 		    {query_string: query_string}
 		 },
 		 beforeSend: function(){
-		 	clear_search_results();
+		 	//clear_search_results();
 		 },
 		 success : function( data ) {},
 		 dataType : "script"
@@ -15,20 +15,40 @@ function navbar_search(query_string){
 
 
 $(document).on('keyup', '#search',function(event){
-	if( $(this).val().length === 0 ){
-		clear_search_results()
+	navbar_search($(this).val());
+});
+
+/* Clear the search result if focus out from the title. */
+$(document).on('click','body',function(event){
+	if(event.target.id === 'search'){
+		
+	}
+	else if(event.target.id === 'search_title'){
+		
 	}
 	else{
-		navbar_search($(this).val());
+		$(".search_result").remove();
 	}
 });
 
-var clear_search_results = function(){
-	$("#navbar_search_results").html("");;
+/* Highlight Autocomplete Matching Text */
+var highlight = function() {
+	
+	var strings = $("#search").val().split(/\s+/);
+	
+	$.each(strings,function(index,string){
+		
+		$(".search_result").each(function () {
+		
+		var matchStart = $(this).html().toLowerCase().indexOf("" + string.toLowerCase() + "");
+		
+		var matchEnd = matchStart + string.length - 1;
+		
+		var beforeMatch = $(this).html().slice(0, matchStart);
+		var matchText = $(this).html().slice(matchStart, matchEnd + 1);
+		var afterMatch = $(this).html().slice(matchEnd + 1);
+		$(this).html(beforeMatch + "<span class='yellow'>" + matchText + "</span>" + afterMatch);
+		});
+	});
+	
 }
-
-/***
-when search is empty, clear the search results.
-when new search key is pressed, clear the older search results.
-when focus is not on the search bar, then clear the search results.
-****/

data/lib/assets/javascripts/spinner.js

@@ -1,16 +1,18 @@
  $(document).bind("ajaxSend", function(){
    $(".modal:visible").find(".error_notification").hide();
-   $("#progress_circle").show();
+   $("#progress").css('visibility','visible');
  }).bind("ajaxStop", function(){
-   $("#progress_circle").hide();
+   
  }).bind("ajaxComplete",function(event,request,settings){
+   // do this with a small timeout.
+   setTimeout(function(){ $("#progress").css('visibility','hidden'); }, 500);
    
    //$("body").append("<div id='dog'>dogged</div>");
  }).bind("ajaxError",function(event,request,settings){
    //console.log(event);
    //console.log(request);
    //console.log(settings);
-   $("#progress_circle").hide();
+   setTimeout(function(){ $("#progress").css('visibility','hidden'); }, 500);
    var request_url = settings.url;
    var request_method = settings.type;
    var status = request.status;

data/lib/auth/engine.rb

@@ -18,6 +18,7 @@ module Auth
       g.test_framework :rspec
     end
 
+    
 
   end
 
@@ -238,6 +239,28 @@ module Auth
     attr_accessor :two_factor_otp_transactional_sms_template_sender_id
     attr_accessor :two_factor_otp_transactional_sms_template_name
 
+
+    ###############################################################
+    ##
+    ##
+    ## HASHIDS SALT.
+    ## THIS IS USED IN PERSONALITY AND PLACE.
+    ##
+    ###############################################################
+
+    attr_accessor :hashids_salt
+    attr_accessor :hashids_alphabet
+
+
+    ###############################################################
+    ##
+    ##
+    ## FOR BARCODE.
+    ##
+    ##
+    ###############################################################
+    attr_accessor :enable_barcode_api
+
     def initialize
       
 
@@ -500,6 +523,23 @@ module Auth
       @two_factor_otp_transactional_sms_template_name = "test2"
       @two_factor_otp_transactional_sms_template_sender_id = "PATHOF"
 
+
+      ########################################################
+      ##
+      ##
+      ########################################################
+      @hashids_salt = "i am a salt"
+      @hashids_alphabet = "abcdefghijklmnopqrstuvwxyz123456789"
+
+
+      ########################################################
+      ##
+      ## barcode : api enabled by default.
+      ##
+      ########################################################
+      @enable_barcode_api = true
+
+
     end
   end
   

data/lib/auth/rails/routes.rb

@@ -61,6 +61,8 @@ module ActionDispatch::Routing
 	      	end
 	      end
 
+	      resources :bar_codes, :controller => "auth/shopping/bar_codes"
+
 	      ## this controller may need to be changed, actually will have to be changed for every single thing.
 	      resources :assemblies, :controller => Auth.configuration.assembly_controller
 

data/lib/auth/search/main.rb

@@ -6,9 +6,14 @@ module Auth
 			## the query_string is left blank, and you should merge this in through any def that wants to perform an ngram query.
 			## param[Symbol] search_on_field : the field on which we are going to do the n_Gram query. Most of the times this should default to _all_fields
 			## @return[Hash]
-			def self.es_six_base_ngram_query(search_on_field)
+			def self.es_six_base_ngram_query(search_on_field,highlight_fields=nil)
 				
-				search_on_field ||= :all_fields
+				search_on_field ||= :tags
+				highlight_fields ||= {
+					fields: {
+						model_fields: {}
+					}
+				}
 
 				qc = {
 					body: {
@@ -25,7 +30,8 @@ module Auth
 									}
 								}
 							}
-						}
+						},
+						highlight: highlight_fields
 					}
 				}
 
@@ -51,7 +57,7 @@ module Auth
 			## @return[Hash] : returns a query clause(hash) 
 			def self.es_six_finalize_search_query_clause(args)
 
-				search_on_field = args[:search_field] || :_all_fields
+				search_on_field = args[:search_field] || :tags
 				
 				args = args.deep_symbolize_keys
 				
@@ -59,12 +65,13 @@ module Auth
 				
 				query = es_six_base_ngram_query(search_on_field)
 				
-				query[:size] = args[:size] || 20
+				query[:size] = args[:size] || 5
 				
 				query[:body][:query][:bool][:must][:match][search_on_field][:query] = args[:query_string]
 
-				
+
 				if args[:resource_id]
+					## if a resource id is provided, show all public records + those records which have this resource id as the owner.
 					query[:body][:query][:bool][:filter] = {
 							
 								bool: {
@@ -95,12 +102,21 @@ module Auth
 							
 						}
 				else
-					## if a resource id is not provided then
-					## it means that the resource is admin,
-					## and they should be able to access and see
-					## any resource
-					## so in that case we leave the query
-					## as is.
+					## if its not provided, and there is no admin in the args, then only show the public records.
+					unless args[:resource_is_admin]
+						query[:body][:query][:bool][:filter] = {
+							bool: 
+							{
+								must: [
+									{
+										term: {
+											public: "yes"
+										}
+									}
+								]
+							}
+						} 
+					end
 				end
 
 				query
@@ -112,7 +128,6 @@ module Auth
 			## @return[Array] response: an array of mongoid search result objects. 
 			def self.search(args)	
 				query = es_six_finalize_search_query_clause(args)
-				puts "query finalized as:"
 				puts JSON.pretty_generate(query)
 				Mongoid::Elasticsearch.search(query,{:wrapper => :load}).results
 			end