ish_manager 0.1.8.56 → 0.1.8.57

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b27e886a39fd33949a37884935736026aa084e2
-  data.tar.gz: 81d785e017bf73d55acf902311f6a5acc9fd19cd
+  metadata.gz: 42bbdd4482e26273e7f503f3d6968a7542a6390b
+  data.tar.gz: 5d38163d5a4841676f0f6a55b19c7686bd9af538
 SHA512:
-  metadata.gz: d482ec1d7f8186bddd27cc7b342cc894f562e8cd02c7ed391712af654acf25d379c77e245c5c2b43cef1d98882039700093c72a74264d1bb6f11434c76dc6c7d
-  data.tar.gz: cdb7d8495f8098c4734156532d3b2aa1e9a18606950d297783fd60569f6e7cbe91aef15c6060bad49d7acfd02cded1f9800cf14d6250e66b6c403c8308a0bb7f
+  metadata.gz: 3f2bcad9b8957180a5280ee9ccddb967982bdca02b6bc3a9b225e0694f23d0db64ec23c0ef3930ad6919006351d2626ae60c3499108a2dc3d36d2155acb48b60
+  data.tar.gz: 277e38495bcefbd68c352aa4ed225f99958887bc6cfe40e3043fda4e23f2ae049f5aae58927238a25cbcf96fe53d527ca3e1fa427716ce30d03969405421b4c1

data/app/assets/stylesheets/ish_manager/application.css

@@ -117,7 +117,7 @@ ul.tags ul.tags {
 }
 
 /**
- * ally
+ * ally, stock watches
  */
 .price {
   /* margin-left: 1em; */
@@ -131,3 +131,10 @@ ul.tags ul.tags {
   top: 1em;
   left: 0;
 }
+table.stock_watches td {
+  border-right: 1px solid cyan;
+  padding: 15px;
+}
+table.stock_watches .trashy {
+  background: #cecece;
+}

data/app/controllers/ish_manager/stock_watches_controller.rb

@@ -0,0 +1,39 @@
+
+class IshManager::StockWatchesController < IshManager::ApplicationController
+
+  def index
+    authorize! :index, IshModels::StockWatch
+    @profiles = IshModels::UserProfile.all
+    @stock_watches = IshModels::StockWatch.all.includes( :profile )
+    @stock_watch = IshModels::StockWatch.new
+    render 'index', :layout => 'ish_manager/application_no_materialize'
+  end
+
+  def create
+    @stock_watch = IshModels::StockWatch.new params[:ish_models_stock_watch].permit!
+    authorize! :create, @stock_watch
+    flag = @stock_watch.save
+    if flag
+      flash[:notice] = 'Created stock watch.'
+    else
+      flash[:alert] = "Cannot create stock watch: #{@stock_watch.errors.messages}"
+    end
+    redirect_to :action => 'index'
+  end
+
+  def update
+    @stock_watch = IshModels::StockWatch.find params[:id]
+    authorize! :update, @stock_watch
+    flag = @stock_watch.update_attributes params[:ish_models_stock_watch].permit!
+    if flag
+      flash[:notice] = 'Updated stock watch.'
+    else
+      flash[:alert] = "Cannot update stock watch: #{@stock_watch.errors.messages}"
+    end
+    redirect_to :action => 'index'
+  end
+
+end
+
+
+

data/app/controllers/ish_manager/user_profiles_controller.rb

@@ -2,7 +2,7 @@
 class IshManager::UserProfilesController < IshManager::ApplicationController
 
   def index
-    @user_profiles = IshModels::UserProfile.all
+    @user_profiles = IshModels::UserProfile.all.includes( :user )
     authorize! :index, IshModels::UserProfile
   end
 

data/app/mailers/ish_manager/application_mailer.rb

@@ -1,3 +1,4 @@
+
 module IshManager
   class ApplicationMailer < ActionMailer::Base
     default from: 'from@example.com'
@@ -10,7 +11,7 @@ module IshManager
 
     def stock_alert stock
       @stock = stock
-      mail( :to => 'piousbox@gmail.com', :subject => 'IshManager Stock Alert' ).deliver
+      mail( :to => stock.profile.email, :subject => 'IshManager Stock Alert' ).deliver
     end
 
   end

data/app/models/ish_manager/ability.rb

@@ -10,7 +10,7 @@ class IshManager::Ability
     unless user.blank?
 
       # role manager
-      if user.profile && user.profile.role_name == :manager
+      if user.profile && [ :manager, :admin ].include?( user.profile.role_name )    
 
         can [ :create_newsitem, :show, :new_feature, :create_feature ], ::City
 
@@ -25,6 +25,7 @@ class IshManager::Ability
         can [ :show, :edit, :update, :create_newsitem, :new_feature, :create_feature ], ::Site do |site|
           !site.is_private && !site.is_trash
         end
+        can [ :manage ], IshModels::StockWatch
 
         # can [ :new_feature, :create_feature ], ::Tag
 

data/app/views/ish_manager/application/_main_header.haml

@@ -14,6 +14,6 @@
           %li{ :class => params[:controller] == 'ish_manager/tags'          ? 'active' : '' }= link_to 'Tags',      tags_path
           %li{ :class => params[:controller] == 'ish_manager/venues'        ? 'active' : '' }= link_to 'Venues',    venues_path
           %li{ :class => params[:controller] == 'ish_manager/videos'        ? 'active' : '' }= link_to 'Videos',    videos_path
-          %li{ :class => params[:controller] == 'ish_manager/ally'          ? 'active' : '' }= link_to 'Ally',      ally_root_path
+          %li{ :class => params[:controller] == 'ish_manager/stock_watches' ? 'active' : '' }= link_to 'Ally',      stock_watches_path
   %hr
 

data/app/views/ish_manager/stock_watches/_form.haml

@@ -0,0 +1,20 @@
+
+- url = stock_watches_path if !stock_watch.persisted? 
+- url = stock_watch_path( stock_watch ) if stock_watch.persisted?
+
+= form_for stock_watch, :url => url, :html => { :class => 'form-inline well' } do |f|
+  .form-group
+    = f.select :action, options_for_select( IshModels::StockWatch::ACTIONS.map{|a|[a,a]}, :selected => stock_watch.action )
+  .form-group
+    = f.select :profile, options_for_select( [[nil,nil]]+@profiles.map{|p|[p.email,p.id]}, :selected => stock_watch.profile ? stock_watch.profile.id : nil )
+  .form-group
+    %label.control-label When
+    = f.text_field :ticker, :class => 'form-control', :placeholder => 'ticker'
+  .form-group
+    %label.control-label Price
+    = f.select :direction, options_for_select( IshModels::StockWatch::DIRECTIONS.map{|d|[d,d]}, :selected => stock_watch.direction )
+  .form-group
+    %label.control-label $
+    = f.number_field :price, :step => 0.01, :placeholder => "0.01"
+  .form-group
+    = f.submit ">", :class => %w(btn blue)

data/app/views/ish_manager/stock_watches/index.haml

@@ -0,0 +1,10 @@
+
+%h4 Ally / Home
+
+%hr
+- @stock_watches.each do |stock|
+  = render 'form', :stock_watch => stock
+        
+%hr
+%h5 New
+= render 'form', :stock_watch => @stock_watch

data/app/views/ish_manager/user_profiles/edit.haml

@@ -1,12 +1,19 @@
 
+%h5 Editing profile of user #{@profile.user.email}
 .a
   = form_for @profile do |f|
     .field
       = f.label :email
-      = f.text_field :email, :disabled => true
+      = f.text_field :email
     .field
       = f.label :role_name
       = f.select :role_name, ::IshModels::UserProfile::ROLES
+    .field
+      = f.label :fb_access_token
+      = f.text_field :fb_access_token
+    .field
+      = f.label :fb_long_access_token
+      = f.text_field :fb_long_access_token
     .action
       = f.submit 'Submit', :class => %w(button)
     

data/app/views/ish_manager/user_profiles/index.haml

@@ -8,7 +8,8 @@
     .panel
       %ul
         %li= link_to '[edit]', edit_user_profile_path( profile )
-        %li Email: #{profile.email}
-        %li Name: #{profile.name}
-        %li Role: #{profile.role_name}
+        %li <b>Email:</b> #{profile.email}
+        %li <b>Name:</b> #{profile.name}
+        %li <b>Role:</b> #{profile.role_name}
+        %li <b>User.email:</b> #{profile.user.email}
       %br

data/config/routes.rb

@@ -1,10 +1,6 @@
 IshManager::Engine.routes.draw do
   root :to => 'application#home'
 
-  scope :ally, :as => 'ally' do
-    root :to => 'ally#home'
-  end
-
   resources :cities do
     resources :features
     resources :newsitems
@@ -36,6 +32,11 @@ IshManager::Engine.routes.draw do
     resources :newsitems
     resources :reports
   end
+  
+  resources :stock_watches
+  # scope :ally, :as => 'ally' do
+  #   root :to => 'ally#home'
+  # end
 
   resources :tags
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.56
+  version: 0.1.8.57
 platform: ruby
 authors:
 - piousbox
@@ -138,7 +138,6 @@ files:
 - app/assets/stylesheets/ish_manager/materialize.css
 - app/assets/stylesheets/ish_manager/trash/bootstrap.min.css
 - app/assets/stylesheets/ish_manager/trash/bootstrap.min.css.map
-- app/controllers/ish_manager/ally_controller.rb
 - app/controllers/ish_manager/application_controller.rb
 - app/controllers/ish_manager/cities_controller.rb
 - app/controllers/ish_manager/features_controller.rb
@@ -148,6 +147,7 @@ files:
 - app/controllers/ish_manager/photos_controller.rb
 - app/controllers/ish_manager/reports_controller.rb
 - app/controllers/ish_manager/sites_controller.rb
+- app/controllers/ish_manager/stock_watches_controller.rb
 - app/controllers/ish_manager/tags_controller.rb
 - app/controllers/ish_manager/user_profiles_controller.rb
 - app/controllers/ish_manager/user_profiles_controller.rb~
@@ -162,7 +162,6 @@ files:
 - app/models/ish_manager/ability.rb
 - app/models/ish_manager/ability.rb~
 - app/models/ish_manager/application_record.rb
-- app/views/ish_manager/ally/home.haml
 - app/views/ish_manager/application/_form_errors.haml
 - app/views/ish_manager/application/_main_footer.haml
 - app/views/ish_manager/application/_main_header.haml
@@ -257,6 +256,8 @@ files:
 - app/views/ish_manager/sites/index.haml
 - app/views/ish_manager/sites/new.haml
 - app/views/ish_manager/sites/show.haml
+- app/views/ish_manager/stock_watches/_form.haml
+- app/views/ish_manager/stock_watches/index.haml
 - app/views/ish_manager/tags/_features.haml
 - app/views/ish_manager/tags/_form.haml
 - app/views/ish_manager/tags/_index.haml

data/app/controllers/ish_manager/ally_controller.rb

@@ -1,12 +0,0 @@
-
-class IshManager::AllyController < IshManager::ApplicationController
-
-  def home
-    authorize! :home_ally, IshManager::Ability
-    render 'home', :layout => 'ish_manager/application_no_materialize'
-  end
-
-end
-
-
-

data/app/views/ish_manager/ally/home.haml

@@ -1,19 +0,0 @@
-
-%h1 Ally / Home
-
-= form_tag nil, :class => 'form-inline well' do
-  .form-group
-    %select
-      %option{ :value => "Email Me" } Email Me
-      %option{ :value => "Do Nothing" } Do Nothing
-  .form-group
-    %label.control-label When
-    = text_field_tag :ticker, 'NFLX', :class => 'form-control'
-  .form-group
-    %label.control-label Price
-    = select_tag :direction, options_for_select([ ['rises above', nil], ['falls below', nil] ])
-  .form-group
-    %label.control-label $
-    = number_field_tag :price, 99.99
-  .form-group
-    = button_tag ">", :class => %w(btn blue)