jinda 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60bc5ed0b6030f8892be7c287ccd80e4268b196a2034a0c76ac8d430b81081de
-  data.tar.gz: 96e6ce7f167c3dbfd75fa98c57d4e7753b2b5d269af8aa0550df37b5c97c976e
+  metadata.gz: f3ce5c17fcecc4aec0dd04876f2f49d0eb09652708eac9940830cbd421feb472
+  data.tar.gz: 78a7b9a7cbb4bf0d24b87156a66c40d56b024a55cc2cba4244f287ce44ce2286
 SHA512:
-  metadata.gz: fe341989317ee7b6f833de1ab7e00420b220baf4dc975efa080950f7cead25593bc8bf1f71c31497f1d6ab93a833ac37de206af7d6b1f0712892f0c95051251b
-  data.tar.gz: fa23f95aca47b63b38c3c6fed6ff49572f138d14ffb8fb76b9504802042da36d519dd7ec390bb6bb22ef8ec2f4e8929a2b7b8169ead5741da084f7881c119662
+  metadata.gz: 8be7403c5159d253c77b86aa9a8c4012e6ae92555d9dd0c83907e585f17a252fe6b4f0ec2009a0504ff3cdf4377021c8704285930332f4b36f14dfe1ab705ce8
+  data.tar.gz: e192a43b60a0588f8b64e8d60f5a029596e5063700c9f105e8087de2ef2416a4c45addb5f2be48b0594690092b60d5f74a2559af618a45f9a67e3519f71d4234

data/lib/generators/jinda/templates/app/models/identity.rb

@@ -7,6 +7,8 @@ class Identity
   field :email, :type => String
   field :password_digest, :type => String
   field :auth_token, :type => String
+	field :image, :type => String
+	
 
 
   validates_presence_of :code

data/lib/generators/jinda/templates/app/models/user.rb

@@ -10,6 +10,7 @@ class User
   field :auth_token, :type => String
   field :password_reset_token, :type => String
   field :password_reset_sent_at,:type => DateTime
+	field :image, :type => String
 
 
   belongs_to :identity, :polymorphic => true, :optional => true
@@ -42,6 +43,7 @@ class User
           user.provider = auth.provider
           user.code = auth.info.name
           user.role = "M"
+					user.image = auth.info.image
         end
       end
     end

data/lib/jinda/helpers.rb

@@ -81,6 +81,33 @@ module Jinda
       default_role= Jinda::Role.where(:code =>'default').first
       return default_role ? default_role.name.to_s : ''
     end
+
+		def sign_in?
+			if current_ma_user.present?
+				return true
+			else
+				return false
+			end
+		end
+
+		# ############################### Themes ###################################
+		#
+		# Check login user information from User model: name(code), image for Themes
+		#
+		# ##########################################################################
+		def get_login_user_info
+			if current_ma_user.present?
+				$user_image = current_ma_user.image
+				$user_name = current_ma_user.code
+				$user_email = current_ma_user.email
+			else
+				$user_image = asset_url("user.png", :width => "48")
+				$user_name = 'Guest User'
+				$user_email = 'guest@sample.com'
+			end
+			return $user_image, $user_name, $user_email
+		end
+
     def name2code(s)
       # rather not ignore # symbol cause it could be comment
       code, name = s.split(':')
@@ -205,7 +232,6 @@ module Jinda
       # end
       #@user ||= User.find_by_auth_token!(cookies[:auth_token]) if cookies[:auth_token]
       @user ||= User.where(:auth_token => cookies[:auth_token]).first if cookies[:auth_token]
-
     end
 
     def ui_action?(s)

data/lib/jinda/version.rb

@@ -1,3 +1,3 @@
 module Jinda
-	VERSION = "0.1.8"
+	VERSION = "0.1.9"
 end

data/lib/tasks/jinda.rake

@@ -18,9 +18,9 @@ namespace :jinda do
   task :seed=> :environment do
     unless Identity.where(code:"admin").exists?
       identity= Identity.create :code => "admin", :email => "admin@test.com", :password => "secret",
-        :password_confirmation => "secret" 
+				:password_confirmation => "secret", :image => "https://user-images.githubusercontent.com/3953832/42472827-50ed8cbc-8388-11e8-8982-fa523c25288f.png"
       User.create :provider => "identity", :uid => identity.id.to_s, :code => identity.code,
-        :email => identity.email, :role => "M,A,D", :auth_token => "71JxMH5fxi23zinBoq1uKA"
+				:email => identity.email, :role => "M,A,D", :auth_token => "71JxMH5fxi23zinBoq1uKA", :image => identity.image
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jinda
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Prateep Kul
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-01 00:00:00.000000000 Z
+date: 2018-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -240,6 +240,7 @@ files:
 - lib/generators/jinda/templates/app/assets/images/tick.png
 - lib/generators/jinda/templates/app/assets/images/twittersmall.png
 - lib/generators/jinda/templates/app/assets/images/user.png
+- lib/generators/jinda/templates/app/assets/images/user_admin_gear.png
 - lib/generators/jinda/templates/app/assets/images/view_code.png
 - lib/generators/jinda/templates/app/assets/javascripts/application.js
 - lib/generators/jinda/templates/app/assets/javascripts/cable.js