ish_manager 0.1.8.500 → 0.1.8.503

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aad53e16372476d88874a2890715c1783fd15074abdf843eb7850c3a8bd462d9
-  data.tar.gz: d8f8011c70d658b73bcb65837b03e742b470519ad3acf75b1ae6d0d6c95d4088
+  metadata.gz: b7465feb8b71a19de0c55e39cbf14d4016792bdcd20f5c0d10ab90397defcffb
+  data.tar.gz: 700d28696374331c9e7c8f3b1f87e74a13392c350a81e89588a4fdb48dfbb0bd
 SHA512:
-  metadata.gz: 56c4796cde285294fc3aaed58fa574d6516173dbb0f953fe5d0528e004dcae4f43dc8447291b6bd7a179dbeccd6f2ead1fbf60cee48d75d6b73f22ce519d9ce8
-  data.tar.gz: f64f1ade2b4cca7bf7a8a1d0e2e33bf58b7668ece0ddff25a21e0b28545a46c75fd7c12f9a2d9f0ffcc8d148be64d724417057fc3386291497cc58a973528555
+  metadata.gz: 29c2cd6c9c46744212e9f23b1b4e7890bd72da84783445270284c79c3b3d1ae06b91297c26d17695325be998daf30da7865162615274fc290533f2149843f209
+  data.tar.gz: c4350008f57978f1e09b13ebc0340b8953c01735c9a28b1d9e351b5c1e66bcc5fbf5261dd68e89b9c128c1d0260180becf271954e9664d1263cf9b935696d525

data/app/controllers/ish_manager/appliance_tmpls_controller.rb

@@ -13,15 +13,32 @@ class ::IshManager::ApplianceTmplsController < IshManager::ApplicationController
       redirect_to action: :index
     else
       flash[:alert] = "Cannot create appliance tmplate: #{@appliance_tmpl.errors.full_messages.join(', ')}."
-      render action: :index
+      redirect_to action: :index
     end
   end
 
+  def edit
+    @appliance_tmpl = Wco::ApplianceTmpl.find params[:id]
+    authorize! :edit, @appliance_tmpl
+  end
+
   def index
     authorize! :index, Wco::ApplianceTmpl
     @appliance_tmpls = Wco::ApplianceTmpl.all
   end
 
+  def update
+    @appliance_tmpl = Wco::ApplianceTmpl.find params[:id]
+    authorize! :update, @appliance_tmpl
+    flag = @appliance_tmpl.update params[:appliance].permit!
+    if flag
+      flash_notice 'success'
+    else
+      flash_alert "Cannot update appliance template: #{@appliance_tmpl.errors.full_messages.join(', ')}."
+    end
+    redirect_to action: :index
+  end
+
   ##
   ## private
   ##

data/app/controllers/ish_manager/serverhosts_controller.rb

@@ -1,7 +1,7 @@
 
 class ::IshManager::ServerhostsController < IshManager::ApplicationController
 
-  # before_action :set_lists
+  before_action :set_lists
 
   def create
     @serverhost = Wco::Serverhost.new params[:serverhost].permit!
@@ -28,6 +28,11 @@ class ::IshManager::ServerhostsController < IshManager::ApplicationController
     @new_serverhost = Wco::Serverhost.new
   end
 
+  def show
+    @serverhost = Wco::Serverhost.find params[:id]
+    authorize! :show, @serverhost
+  end
+
   def update
     @serverhost = Wco::Serverhost.find params[:id]
     authorize! :update, @serverhost
@@ -48,13 +53,16 @@ class ::IshManager::ServerhostsController < IshManager::ApplicationController
   ##
   private
 
-  # def set_lists
-  #   super
-  #   @new_serverhost = Wco::Serverhost.new
-  #   puts! @new_serverhost.class, 'ze'
-  #   puts! @new_serverhost, '@new_serverhost'
-  #   @new_serverhost.name = 'some name'
-  # end
+  def set_lists
+    # super
+
+    # @new_serverhost = Wco::Serverhost.new
+    # puts! @new_serverhost.class, 'ze'
+    # puts! @new_serverhost, '@new_serverhost'
+    # @new_serverhost.name = 'some name'
+
+    @wco_leadsets_list = [[nil,nil]] + Wco::Leadset.all.map { |i| [ i.name, i.id ] }
+  end
 
 end
 

data/app/controllers/ish_manager/wco_leadsets_controller.rb

@@ -0,0 +1,35 @@
+
+class IshManager::WcoLeadsetsController < IshManager::ApplicationController
+
+  def create
+  end
+
+  def edit
+    @wco_leadset = Wco::Leadset.find params[:id]
+    authorize! :edit, @wco_leadset
+  end
+
+  def index
+    authorize! :index, Wco::Leadset
+    @wco_leadsets = Wco::Leadset.all
+  end
+
+  def show
+    @wco_leadset = Wco::Leadset.find params[:id]
+    authorize! :show, @wco_leadset
+  end
+
+  def update
+    @wco_leadset = Wco::Leadset.find params[:id]
+    authorize! :update, @wco_leadset
+    flag = @wco_leadset.update params[:wco_leadset].permit!
+    if flag
+      flash_notice "ok"
+    else
+      flash_alert "sorry"
+    end
+    redirect_to action: :index
+  end
+
+end
+

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

@@ -1,14 +1,23 @@
 
-- url = appliance_tmpl.new_record? ? appliance_tmpls_path : appliance_tmpls_path( appliance_tmpl )
+- url = appliance_tmpl.new_record? ? appliance_tmpls_path : appliance_tmpl_path( appliance_tmpl )
 
 .appliance-tmpls--form
   = form_for appliance_tmpl, as: :appliance, url: url do |f|
-    .input-field
+    .field
       = f.label :kind
       = f.text_field :kind
-    .input-field
+    .field
+      = f.label :version
+      = f.text_field :version
+    .field
+      = f.label :descr
+      = f.text_area :descr
+    .field
       = f.label :image
-      = f.text_field :image
+      = f.text_field :image, class: 'w-100'
+    .field
+      %label volume_zip
+      = f.text_field :volume_zip, class: 'w-100'
 
     .actions
       = f.submit 'Submit'

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

@@ -0,0 +1,4 @@
+
+.appliance-tmpls-edit.maxwidth
+  %h5 Edit ApplianceTmpl `#{@appliance_tmpl}`
+  = render 'form', appliance_tmpl: @appliance_tmpl

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

@@ -6,9 +6,12 @@
   %ul
     - @appliance_tmpls.each do |i|
       %li
+        %span.gray= i.id.to_s
+        = link_to '[~]', edit_appliance_tmpl_path( i )
         %ul
-          %li <b>Kind:</b> #{i.kind}
-          %li <b>Image:</b> #{i.image}
+          - i.attributes.each do |k, v|
+            - next if %| _id created_at updated_at |.include? k
+            %li <b>#{k}:</b> #{v}
 
   %hr
   = render 'form', :appliance_tmpl => @new_appliance_tmpl

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

@@ -125,6 +125,8 @@
         %li
           = link_to 'Subscriptions', subscriptions_path
           = link_to '[+]', new_wco_subscription_path
+        %li
+          = link_to 'Wco::Leadset\'s', wco_leadsets_path
 
 
     .c

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

@@ -5,9 +5,10 @@
     .field
       = f.label :name
       = f.text_field :name
+
     .field
-      = f.label :leadset_id
-      = f.number_field :leadset_id
+      %label Wco::Leadset
+      = f.select :wco_leadset, options_for_select( @wco_leadsets_list, selected: serverhost.wco_leadset_id ), class: [ :select2 ]
     .field
       = f.label :next_port
       = f.number_field :next_port
@@ -15,15 +16,15 @@
     .field
       = f.label :ssh_host
       = f.text_field :ssh_host
-    .field
-      = f.label :ssh_username
-      = f.text_field :ssh_username
-    .field
-      = f.label :ssh_key
-      = f.text_field :ssh_key
-    .field
-      = f.label :nginx_root
-      = f.text_field :nginx_root
+    -# .field
+    -#   = f.label :ssh_username
+    -#   = f.text_field :ssh_username
+    -# .field
+    -#   = f.label :ssh_key
+    -#   = f.text_field :ssh_key
+    -# .field
+    -#   = f.label :nginx_root
+    -#   = f.text_field :nginx_root
 
     .actions
       = f.submit 'Submit'

data/app/views/ish_manager/serverhosts/_index.haml

@@ -2,18 +2,18 @@
 .serverhosts--index
   %h5 Serverhosts (#{serverhosts.length})
 
-  %ul.items
-    - serverhosts.each do |i|
-      %li
-        = i.name
-        %span.gray= i.id.to_s
-        = link_to '[~]', edit_serverhost_path(i)
+  .items
+    - serverhosts.each do |s|
+      .card.inline-block
+        = s.name
+        %span.gray= s.id.to_s
+        = link_to '[~]', edit_serverhost_path(s)
         %ul
-          %li.leadset_id <b>leadset_id:</b> #{i.leadset_id}
-          %li.next_port <b>Next Port:</b> #{i.next_port}
-          %li.ssh_host <b>ssh_host:</b> #{i.ssh_host}
-          %li.ssh_username <b>ssh_username:</b> #{i.ssh_username}
-          %li.ssh_key <b>ssh_key:</b> #{i.ssh_key}
-          %li.nginx_root <b>nginx_root:</b> #{i.nginx_root}
-          %li.appliances
-            = render 'ish_manager/appliances/index', appliances: i.appliances
+          %li.wco-leadset <b>wco_leadset:</b> #{s.wco_leadset.name} (#{s.wco_leadset.id})
+          %li.next_port <b>Next Port:</b> #{s.next_port}
+          %li.ssh_host <b>ssh_host:</b> #{s.ssh_host}
+          -# %li.ssh_username <b>ssh_username:</b> #{s.ssh_username}
+          -# %li.ssh_key <b>ssh_key:</b> #{s.ssh_key}
+          %li.nginx_root <b>nginx_root:</b> #{s.nginx_root}
+          -# %li.appliances
+          -#   = render 'ish_manager/appliances/index', appliances: s.appliances

data/app/views/ish_manager/serverhosts/show.haml

@@ -0,0 +1,6 @@
+
+.serverhosts-edit.max-width
+  %h5
+    = link_to '<-', serverhosts_path
+    Show serverhost `#{@serverhost.name}` #{link_to '[~]', edit_serverhost_path( @serverhost )}
+  = render 'form', serverhost: @serverhost

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

@@ -1,6 +1,6 @@
 
 .user-profiles-edit.max-width
   .header
-    %h2.title Editing profile for: `#{@profile.email}`
+    %h2.title Editing profile `#{link_to @profile.email, user_profile_path(@profile) }`
 
   = render 'form', :profile => @profile

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

@@ -1,7 +1,9 @@
 
 .user-profiles-show.max-width
   .header
-    %h2.title Profile #{@profile.email}
+    %h2.title Profile `#{@profile.email}`
+  %ul
+    %li <b>Leadset:</b> #{link_to @profile.leadset.name, leadset_path(@profile.leadset)}
 
   .newsitems
     .title Newsitems (#{@profile.newsitems.length})

data/app/views/ish_manager/user_profiles/trash/_show.haml

@@ -0,0 +1,39 @@
+- profile ||= user_profile
+
+.user-profiles--show.max-width
+  .header
+    %h2.title Profile #{profile.email}
+
+  .newsitems
+    .title Newsitems (#{profile.newsitems.length})
+    - profile.newsitems.each do |newsitem|
+      = render 'ish_manager/newsitems/show', newsitem: newsitem
+
+  .premium-purchases
+    Payments (purchased items) (#{profile.payments.length}):
+    - profile.payments.each do |payment|
+      .Card.item
+        = payment
+
+
+  %ul
+    %li
+      <b>Email:</b> #{link_to profile.email, user_profile_path(profile)}
+      = link_to '[edit]', edit_user_profile_path( profile )
+    %li <b>Name:</b> #{profile.name}
+    %li <b>Role:</b> #{profile.role_name}
+    %li
+      <b>Profile Photo:</b>
+      = image_tag profile.profile_photo.photo.url(:thumb) rescue nil
+
+.col.s8
+  %h5 Shared galleries
+  - profile.shared_galleries.unscoped.where( :is_trash => false ).each do |g|
+    &gt; #{link_to g.name, gallery_path(g.slug)} <br />
+    = render 'meta', :item => g
+  <hr />
+
+  %h5 Newsitems
+  - profile.newsitems.each do |n|
+    = render 'ish_manager/newsitems/item', n: n, profile_id: profile.id
+  <hr />

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

@@ -0,0 +1,12 @@
+
+.wco-leadsets--form
+  = form_for wco_leadset do |f|
+    .field
+      %label name
+      = f.text_field :name
+    .field
+      %label domains, space-separated
+      = f.text_field :domains
+
+    .actions
+      = f.submit 'Submit'

data/app/views/ish_manager/wco_leadsets/_index.haml

@@ -0,0 +1,11 @@
+
+.wco-leadsets--index
+  - leadsets.each do |leadset|
+    .Card
+      = link_to leadset.name, wco_leadset_path( leadset )
+      = link_to '[~]', edit_wco_leadset_path( leadset )
+      %ul.item
+        %li <b>Next Serverhost:</b> #{link_to leadset.next_serverhost.ssh_host, serverhost_path( leadset.next_serverhost ) }
+        %li <b>Domains:</b> #{leadset.domains}
+
+

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

@@ -0,0 +1,4 @@
+
+.wco-leadsets-edit.maxwidth
+  %h5 Edit Wco::Leadset `#{link_to @wco_leadset.name, wco_leadset_path( @wco_leadset) }`
+  = render 'form', wco_leadset: @wco_leadset

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

@@ -0,0 +1,6 @@
+
+.wco-leadsets-index.maxwidth
+  %h5 Wco::Leadset's
+
+  = render 'index', leadsets: @wco_leadsets
+

data/app/views/ish_manager/wco_leadsets/show.haml

@@ -0,0 +1,8 @@
+
+.wco-leadsets-show.maxwidth
+  %h5
+    = link_to '<-', wco_leadsets_path
+    Wco::Leadset `#{@wco_leadset.name}`
+  = render 'index', leadsets: [ @wco_leadset ]
+
+

data/config/routes.rb

@@ -174,4 +174,6 @@ IshManager::Engine.routes.draw do
   ##
   resources :videos
 
+  resources :wco_leadsets
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.500
+  version: 0.1.8.503
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-30 00:00:00.000000000 Z
+date: 2023-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -526,6 +526,7 @@ files:
 - app/controllers/ish_manager/unsubscribes_controller.rb
 - app/controllers/ish_manager/user_profiles_controller.rb
 - app/controllers/ish_manager/videos_controller.rb
+- app/controllers/ish_manager/wco_leadsets_controller.rb
 - app/helpers/ish_manager/application_helper.rb
 - app/helpers/ish_manager/images_helper.rb
 - app/jobs/ish_manager/application_job.rb
@@ -575,6 +576,7 @@ files:
 - app/views/ish_manager/analytics/index.haml
 - app/views/ish_manager/analytics/test.haml
 - app/views/ish_manager/appliance_tmpls/_form.haml
+- app/views/ish_manager/appliance_tmpls/edit.haml
 - app/views/ish_manager/appliance_tmpls/index.haml
 - app/views/ish_manager/appliances/_form.haml
 - app/views/ish_manager/appliances/_index.haml
@@ -848,6 +850,7 @@ files:
 - app/views/ish_manager/serverhosts/_index.haml
 - app/views/ish_manager/serverhosts/edit.haml
 - app/views/ish_manager/serverhosts/index.haml
+- app/views/ish_manager/serverhosts/show.haml
 - app/views/ish_manager/subscriptions/_form.haml
 - app/views/ish_manager/subscriptions/index.haml
 - app/views/ish_manager/subscriptions/new.haml
@@ -860,11 +863,11 @@ files:
 - app/views/ish_manager/trash/email_campaigns-trash/new.haml
 - app/views/ish_manager/unsubscribes/index.haml
 - app/views/ish_manager/user_profiles/_form.haml
-- app/views/ish_manager/user_profiles/_show.haml
 - app/views/ish_manager/user_profiles/edit.haml
 - app/views/ish_manager/user_profiles/index.haml
 - app/views/ish_manager/user_profiles/new.haml
 - app/views/ish_manager/user_profiles/show.haml
+- app/views/ish_manager/user_profiles/trash/_show.haml
 - app/views/ish_manager/users/_index.haml
 - app/views/ish_manager/users/index.haml
 - app/views/ish_manager/videos/_form.haml
@@ -883,6 +886,11 @@ files:
 - app/views/ish_manager/videos/trash/_list_small.haml
 - app/views/ish_manager/videos/trash/_meta_edit.haml
 - app/views/ish_manager/videos/trash/_preview.haml
+- app/views/ish_manager/wco_leadsets/_form.haml
+- app/views/ish_manager/wco_leadsets/_index.haml
+- app/views/ish_manager/wco_leadsets/edit.haml
+- app/views/ish_manager/wco_leadsets/index.haml
+- app/views/ish_manager/wco_leadsets/show.haml
 - app/views/layouts/ish_manager/application.haml
 - app/views/layouts/ish_manager/done/20230316 application.haml
 - app/views/layouts/ish_manager/email_iframe.haml

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

@@ -1,35 +0,0 @@
-- profile ||= user_profile
-
-.row
-  .col.s4
-    %ul
-      %li
-        <b>Email:</b> #{link_to profile.email, user_profile_path(profile)}
-        = link_to '[edit]', edit_user_profile_path( profile )
-      %li <b>Name:</b> #{profile.name}
-      %li <b>Role:</b> #{profile.role_name}
-      %li <b>User.email:</b> #{profile.user ? profile.user.email : nil}
-      %li <b>City:</b> #{profile.current_city ? profile.current_city.name : nil}
-      %li
-        <b>Profile Photo:</b>
-        = image_tag profile.profile_photo.photo.url(:thumb) rescue nil
-
-  .col.s8
-    %h5 Shared galleries
-    - profile.shared_galleries.unscoped.where( :is_trash => false ).each do |g|
-      &gt; #{link_to g.name, gallery_path(g.slug)} <br />
-      = render 'meta', :item => g
-    <hr />
-
-    %h5 Newsitems
-    - profile.newsitems.each do |n|
-      = render 'ish_manager/newsitems/item', n: n, profile_id: profile.id
-    <hr />
-
-    %h5 Bookmarked Locations (#{profile.bookmarked_locations.length})
-    %ul.browser-default
-      - profile.bookmarked_locations.each do |n|
-        %li
-          = n.slug
-
-