wco_hosting 0.0.0.16 → 0.0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30b3e225190919ad99c8611730e0e75415b394eda5b89bc5d173bf70a921dcb5
-  data.tar.gz: 904a1f18e6c3df858c15865dc7d366e0431f75c51644f2688fed523c461b1998
+  metadata.gz: b178202623e8e58406613183f3c2ba45a1159b8b95eac0a68398466b578a7fbc
+  data.tar.gz: 5dfbe1301dab5b5ed929427f698bd19363d9459e8e41ee8e2101e0aee551aa3d
 SHA512:
-  metadata.gz: 7a3094645efe8b263d3eda8b57912cf38dc18b37a92537356b3a121754a369e298b122249b4d7cb16646468d467c651e7463c02de76c13a4cfe23472fccbf97b
-  data.tar.gz: 1d9449a7c3718c7b83cafd40a71bd0012092ff79af6167c143c3796a6ec92bceb4f12a0d7841cce2a55f3fcc8d8d846a15526cb69e42d94d4979d3ea7779d2ff
+  metadata.gz: e40a0614f9d21ddc737e62483d6afb6f506ec3bb176b6d06ac816c22bc0b10091f391bcd787ae42b84aa84969099132ec175ab1d48421cb793cc94aa7b6eda7a
+  data.tar.gz: 87c8bea0677755b19fbb1a74c557f9062b2e697fa6c70b0dffbeff6f94ac309e5f290e8db9b8d360ea96639102de823253be7d7d7ad4be7d51c1b238dce6a20b

data/app/controllers/wco_hosting/appliances_controller.rb

@@ -11,6 +11,11 @@ class WcoHosting::AppliancesController < WcoHosting::ApplicationController
     authorize! :edit, @appliance
   end
 
+  def show
+    @appliance = WcoHosting::Appliance.find params[:id]
+    authorize! :show, @appliance
+  end
+
   # def update
   #   @serverhost = WcoHosting::Serverhost.find params[:id]
   #   authorize! :update, @serverhost

data/app/controllers/wco_hosting/application_controller.rb

@@ -1,7 +1,5 @@
 
-class WcoHosting::ApplicationController < ActionController::Base
-
-  check_authorization
+class WcoHosting::ApplicationController < Wco::ApplicationController
 
   def home
     authorize! :index, ::WcoHosting::Appliance

data/app/controllers/wco_hosting/domains_controller.rb

@@ -11,6 +11,12 @@ class WcoHosting::DomainsController < WcoHosting::ApplicationController
     authorize! :edit, @domain
   end
 
+  def show
+    @domain = WcoHosting::Domain.find params[:id]
+    authorize! :show, @domain
+    @subdomains = WcoHosting::Appliance.where( domain: @domain.name ).map( &:subdomain )
+  end
+
   def update
     @domain = WcoHosting::Domain.find params[:id]
     authorize! :update, @domain

data/app/views/layouts/wco_hosting/application.haml

@@ -4,6 +4,24 @@
     %meta{content: "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}
     %title Wco Hosting
 
+    = javascript_include_tag "//code.jquery.com/jquery-3.3.1.min.js"
+
+    = javascript_include_tag "//cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"
+    = stylesheet_link_tag "//cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css"
+
+    = stylesheet_link_tag "//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css", :media => 'all'
+    = stylesheet_link_tag "//fonts.googleapis.com/icon?family=Material+Icons"
+
+    = stylesheet_link_tag "//cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/css/bootstrap.min.css"
+    = javascript_include_tag "//cdn.jsdelivr.net/npm/popper.js@1.14.7/dist/umd/popper.min.js"
+    = javascript_include_tag "//cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/js/bootstrap.min.js"
+
+    = stylesheet_link_tag "//cdn.jsdelivr.net/npm/select2@4.0.0/dist/css/select2.min.css"
+    = javascript_include_tag "//cdn.jsdelivr.net/npm/select2@4.0.0/dist/js/select2.min.js", defer: 'defer'
+
+    = stylesheet_link_tag "//cdn.jsdelivr.net/npm/summernote@0.8.18/dist/summernote.min.css"
+    = javascript_include_tag "//cdn.jsdelivr.net/npm/summernote@0.8.18/dist/summernote.min.js"
+
     = javascript_include_tag "wco/application"
     = stylesheet_link_tag    "wco/application", media: "all"
 
@@ -25,3 +43,6 @@
     %script{:src => "https://js.stripe.com/v3/"}
     :javascript
       stripe = Stripe('#{::STRIPE_PK}', { apiVersion: '2020-08-27' });
+
+    = render '/wco/main_footer'
+    = render '/wco_email/analytics' if Rails.env.production?

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

@@ -5,10 +5,6 @@
   = form_for appliance_tmpl, as: :tmpl, url: url do |f|
     .actions
       = f.submit 'Submit'
-
-
-      -# = f.select :leadset_ids, options_for_select( @leadsets_list, selected: appliance_tmpl.leadset_ids ), {}, { multiple: true }
-
     .d-flex
       = f.label :kind
       = f.text_field :kind, style: 'flex-grow: 1'
@@ -24,20 +20,5 @@
     .field
       %label volume_zip
       = f.text_field :volume_zip, class: 'w-100'
-    -# .field
-    -#   %label Price in Cents
-    -#   = f.number_field :tmp_price_cents
-    -#   %label Price interval
-    -#   = f.select :tmp_price_interval, options_for_select( Wco::Price::INTERVALS ), class: 'select2'
-
     .actions
-      = f.submit 'Submit'
-
-    .prices
-      %label Prices
-      %ul
-        - appliance_tmpl.prices.each do |price|
-          %li= price.inspect
-
-
-  = appliance_tmpl.inspect
+      = f.submit 'Submit'

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

@@ -4,26 +4,37 @@
 
   .field
     %h5 Customers
-    %ul
+    %table.bordered.data-table
+      %thead
+        %td  
+        %td Leadset
+        %td Amount Cents
+        %td Interval
       - @leadsets.each do |leadset|
-        - price = leadset.appliance_tmpl_prices.where( product: @appliance_tmpl ).first
-        - price ||= Wco::Price.new({ product: @appliance_tmpl, appliance_tmpl_leadset: leadset })
-        - url = price.new_record? ? wco.prices_path : wco.price_path(price)
-        %li
+        %tr
+          - price   = leadset.appliance_tmpl_prices.where( product: @appliance_tmpl ).first
+          - price ||= Wco::Price.new({ product: @appliance_tmpl, appliance_tmpl_leadset: leadset })
+          - url     = price.new_record? ? wco.prices_path : wco.price_path(price)
+          - if !price.new_record?
+            %td
+              = button_to 'x', wco.price_path(price), method: :delete, data: { confirm: 'Are you sure?' }
+          - else
+            %td
           = form_for price, url: url do |f|
             = hidden_field_tag 'price[product_id]',   price.product_id
             = hidden_field_tag 'price[product_type]', price.product_type
             = hidden_field_tag 'price[appliance_tmpl_leadset_id]', leadset.id
-            .d-flex
+            %td
               %b= leadset
-               
-              %label Amount Cents
+            %td
               = f.number_field :amount_cents
-              %label interval
-              = f.select :interval, options_for_select( Wco::Price::INTERVALS ), class: 'select2'
+            %td
+              = f.select :interval, options_for_select( Wco::Price::INTERVALS, selected: price.interval ), class: 'select2'
               = f.submit '>'
                
               .gray= price.price_id || 'nil'
+
+
   %hr
 
   = render 'form', appliance_tmpl: @appliance_tmpl

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

@@ -22,6 +22,8 @@
         %td= tmpl.image
         %td= tmpl.volume_zip
         %td
+          %b Product:
+          .gray= tmpl.product_id
           %ul
             - tmpl.prices.each do |price|
               %li

data/app/views/wco_hosting/appliances/index.haml

@@ -3,23 +3,25 @@
   %h5 Appliances
 
   %table.bordered.data-table
-    %tr
-      %th  
-      %th created_at
-      %th tmpl
-      %th host
-      %th service_name
+    %thead
+      %td  
+      %td created_at
+      %td tmpl
+      %td host
+      %td service_name
+      %td port
 
     - @appliances.each do |app|
       %tr
         %td
           = link_to '[~]', edit_appliance_path(app)
           -# = link_to '[view]', appliance_path(app)
-          .gray.mini= app.id
+          .gray.mini= link_to app.id, appliance_path(app)
         %td
           = app.created_at
         %td= app.tmpl
         %td= app.host
         %td= app.service_name
+        %td= app.port
 
 

data/app/views/wco_hosting/appliances/show.haml

@@ -0,0 +1,27 @@
+
+.appliances-edit.maxwidth
+  %h5 Appliance `#{@appliance}`
+
+  %ul
+    %li
+      %label.bold Leadset:
+      = link_to @appliance.leadset, wco.leadset_path(@appliance.leadset)
+    %li
+      %label.bold Env:
+      = @appliance.environment
+    %li
+      %label.bold Tmpl:
+      = @appliance.appliance_tmpl
+
+  .logs
+    %h5 Logs
+    %ul
+      - @appliance.logs.each do |log|
+        %li
+          = log.created_at
+          %b= log.label
+          %pre.descr= log.message
+
+  = @appliance.inspect
+
+

data/app/views/wco_hosting/domains/index.haml

@@ -14,6 +14,6 @@
         %td
           = link_to '[~]', edit_domain_path(dom)
         %td
-          = dom.name
+          = link_to dom.name, domain_path(dom)
         %td= dom.status
         -# %td= dom.inspect

data/app/views/wco_hosting/domains/show.haml

@@ -0,0 +1,7 @@
+
+.domains-show
+  %h5 Domain `#{@domain}`
+
+  %ul
+    - @subdomains.each do |sub|
+      %li= sub

data/app/views/wco_hosting/serverhosts/index.haml

@@ -7,16 +7,17 @@
   %table.bordered
     %tr
       %th name
-      %th next_port
-      %th public_ip
       %th ssh_host
+      %th public_ip
+      %th next_port
       -# %td  
-    - @serverhosts.each do |s|
+    - @serverhosts.each do |ser|
       %tr
         %td
-          = link_to s.name, edit_serverhost_path(s)
-        %td= s.ssh_host
-        %td= s.next_port
-        %td= s.public_ip
-        -# %td= s.inspect
+          = link_to '[~]', edit_serverhost_path(ser)
+          = ser.name
+        %td= ser.ssh_host
+        %td= ser.public_ip
+        %td= ser.next_port
+        -# %td= ser.inspect
 

data/config/initializers/assets.rb

@@ -1,4 +1,10 @@
 
 Rails.application.config.assets.version = '1.0'
 
-Rails.application.config.assets.precompile += %w( application.js application.css )
+Rails.application.config.assets.precompile += %w(
+  wco_models/application.js
+  wco_models/application.css
+
+  application.js
+  application.css
+);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_hosting
 version: !ruby/object:Gem::Version
-  version: 0.0.0.16
+  version: 0.0.0.18
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-13 00:00:00.000000000 Z
+date: 2024-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cancancan
@@ -232,13 +232,11 @@ files:
 - app/assets/config/wco_hosting_manifest.js
 - app/assets/javascript/wco_hosting/application.js
 - app/assets/stylesheets/wco_hosting/application.css
-- app/assets/stylesheets/wco_hosting/dark_theme.scss
 - app/assets/stylesheets/wco_hosting/main.scss
 - app/controllers/wco_hosting/appliance_tmpls_controller.rb
 - app/controllers/wco_hosting/appliances_controller.rb
 - app/controllers/wco_hosting/application_controller.rb
 - app/controllers/wco_hosting/domains_controller.rb
-- app/controllers/wco_hosting/leadsets_controller.rb-trash
 - app/controllers/wco_hosting/serverhosts_controller.rb
 - app/controllers/wco_hosting/subscriptions_controller.rb
 - app/helpers/wco_hosting/application_helper.rb
@@ -251,10 +249,12 @@ files:
 - app/views/wco_hosting/appliance_tmpls/new.haml
 - app/views/wco_hosting/appliances/edit.haml
 - app/views/wco_hosting/appliances/index.haml
+- app/views/wco_hosting/appliances/show.haml
 - app/views/wco_hosting/application/home.haml
 - app/views/wco_hosting/domains/_form.haml
 - app/views/wco_hosting/domains/edit.haml
 - app/views/wco_hosting/domains/index.haml
+- app/views/wco_hosting/domains/show.haml
 - app/views/wco_hosting/leadsets/_form.haml
 - app/views/wco_hosting/leadsets/index.haml
 - app/views/wco_hosting/leadsets/show.haml

data/app/assets/stylesheets/wco_hosting/dark_theme.scss

@@ -1,16 +0,0 @@
-
-body {
-  background: #222;
-  color: #ccc;
-}
-a {
-  // color: #d30048;
-  color: #00c5b7;
-}
-
-input,
-select,
-textarea {
-  background: #333;
-  color: #ccc;
-}

data/app/controllers/wco_hosting/leadsets_controller.rb-trash

@@ -1,44 +0,0 @@
-
-class WcoHosting::LeadsetsController < WcoHosting::ApplicationController
-
-  before_action :set_lists
-
-  def index
-    authorize! :index, Wco::Leadset
-    @leadsets = Wco::Leadset.all
-  end
-
-  def show
-    @leadset = Wco::Leadset.find params[:id]
-    authorize! :show, @leadset
-
-  end
-
-  def update
-    @leadset = Wco::Leadset.find params[:id]
-    authorize! :update, @leadset
-    params[:leadset][:serverhost_ids].delete("")
-    puts! params, 'params'
-
-    flag = @leadset.update_attributes( params.require(:leadset).permit(
-      :company_url, :email, serverhost_ids: [] )
-    )
-    if flag
-      flash_notice @leadset
-    else
-      flash_alert @leadset
-    end
-    redirect_to action: :index
-  end
-
-  ##
-  ## private
-  ##
-  private
-
-  def set_lists
-    @serverhosts_list = WcoHosting::Serverhost.list
-  end
-
-
-end