disco_app 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1ef0c316e6efff6bf35a0d4306476e47e6f63b31d53040af71522754a8e2de6
-  data.tar.gz: ed4c9043346a208cab235d6dc451df93cb0893cd7688b780bccdf0c6c876576b
+  metadata.gz: 56c1ba4929abd6bf9f7539edd256f66061ed90ddd974f583b229c5803cc71fdc
+  data.tar.gz: 75f3dcee0e4087e98c2ec9933211cdc5d5ce586a5d674f6e1507e7134267f3bc
 SHA512:
-  metadata.gz: a73f597562488bcf93a07f6fe713857d21304eb5c109f1fc9e8fbbfae870cb2cf6f869ea82edd7053081aaf2da95de8788e3e62d76d240bae4cfc2bd84dc2369
-  data.tar.gz: 40b93ede5ac8bb089e402a9f73c48a3e42e44ab71188fcc590f879faef8dd1a0886820b531d4d7499607397ea8edbacc76580d54b92b29d7d08cb5629a548372
+  metadata.gz: ae82c3a87f6b50d7c6cf878bf2eb34b047fd2d180e2609e4b15226a85dd742a973c0454363f8d4eb64ba4ea65af23b6adce122f1e4160290c9cab524a38fe45f
+  data.tar.gz: 6d184f92b1aed8bc41c8733b0d67869b7e5f70c82be4462657efb731c49c138bbce16c3f83322f82acfc0723f3d0d58d30c3ee5309ed6f69df19c01515bb9e28

data/app/assets/javascripts/disco_app/components/filterable_shop_list.js.jsx

@@ -0,0 +1,65 @@
+var FilterableShopList = React.createClass({
+
+    getDefaultProps: function() {
+        return {
+            filterTabs: [
+                { label: 'All Shops', filter: {} },
+                { label: 'Never Installed', filter: { 'filter[status]': 'never_installed' } },
+                { label: 'Awaiting Install', filter: { 'filter[status]': 'awaiting_install' } },
+                { label: 'Installing', filter: { 'filter[status]': 'installing' } },
+                { label: 'Installed', filter: { 'filter[status]': 'installed' } },
+                { label: 'Awaiting Uninstall', filter: { 'filter[status]': 'awaiting_uninstall' } },
+                { label: 'Uninstalling', filter: { 'filter[status]': 'uninstalling' } },
+                { label: 'Uninstalled', filter: { 'filter[status]': 'uninstalled' } }
+            ],
+            availableFilters: {
+                'filter[status]': {
+                    getLabel: function(value) {
+                        return 'Status is ' + value;
+                    }
+                }
+            }
+        }
+    },
+
+    getInitialState: function() {
+        return {
+            filter: {}
+        };
+    },
+
+    onFilterReplace: function(filter) {
+        this.setState({
+            filter: filter
+        });
+    },
+
+    onFilterSet: function(name, value) {
+        this.onFiltersSet([{
+            name: name,
+            value: value
+        }]);
+    },
+
+    onFiltersSet: function(filters) {
+        var nextFilter = $.extend({}, this.state.filter);
+        filters.forEach(function(filter) {
+            if(!filter.value) {
+                delete nextFilter[filter.name];
+            } else {
+                nextFilter[filter.name] = filter.value;
+            }
+        });
+        this.onFilterReplace(nextFilter);
+    },
+
+    render: function() {
+        return (
+            <div className="next-card">
+              <ShopFilterTabs filterTabs={this.props.filterTabs} filter={this.state.filter} onFilterReplace={this.onFilterReplace} />
+              <ShopList shopsUrl={this.props.shopsUrl} editShopUrl={this.props.editShopUrl} filter={this.state.filter} />
+            </div>
+        );
+    }
+
+});

data/app/assets/javascripts/disco_app/components/shop_filter_tab.js.jsx

@@ -0,0 +1,34 @@
+var ShopFilterTab = React.createClass({
+
+    /**
+     * Handle a click event on the individual tab link.
+     * @param e
+     */
+    handleClick: function(e) {
+        e.preventDefault();
+
+        // Don't do anything if this is already the currently selected tab.
+        if(this.isActive()) return;
+
+        this.props.onFilterTabSelected(this.props.filterTab);
+    },
+
+    /**
+     * Return true if this is the currently active tab, determined by whether the filter values for this tab match the
+     * currently active filter.
+     * @returns {boolean}
+     */
+    isActive: function() {
+        return (JSON.stringify(this.props.filterTab.filter) == JSON.stringify(this.props.filter));
+    },
+
+    render: function() {
+        var tabClassName = this.isActive() ? 'next-tab next-tab--is-active' : 'next-tab';
+        return (
+            <li role="presentation">
+                <a href="#" className={tabClassName} onClick={this.handleClick}>{this.props.filterTab.label}</a>
+            </li>
+        )
+    }
+
+});

data/app/assets/javascripts/disco_app/components/shop_filter_tabs.js.jsx

@@ -0,0 +1,21 @@
+var ShopFilterTabs = React.createClass({
+
+    onFilterTabSelected: function(filterTab) {
+        this.props.onFilterReplace(filterTab.filter);
+    },
+
+    render: function() {
+        var filterTabNodes = this.props.filterTabs.map(function(filterTab) {
+            return (
+                <ShopFilterTab key={filterTab.label} filter={this.props.filter} filterTab={filterTab} onFilterTabSelected={this.onFilterTabSelected} />
+            )
+        }, this);
+
+        return (
+            <ul className="next-tab__list">
+                {filterTabNodes}
+            </ul>
+        )
+    }
+
+});

data/app/assets/javascripts/disco_app/components/shop_list.js.jsx

@@ -0,0 +1,140 @@
+var ShopList = React.createClass({
+
+    getDefaultProps: function() {
+        return {
+            pageSize: 50
+        }
+    },
+
+    getInitialState: function() {
+        return {
+            shops: [],
+            page: 1
+        }
+    },
+
+    componentDidMount: function() {
+        this.getShops();
+        $(document).on('shops.changed', this.onShopsChanged);
+    },
+
+    componentWillUnmount: function() {
+      $(document).off('shops.changed', this.onShopsChanged);
+    },
+
+    componentDidUpdate: function (prevProps, prevState) {
+        if(prevProps.filter != this.props.filter) {
+            this.getShops();
+        }
+        if(prevState.page != this.state.page) {
+            this.getShops();
+        }
+    },
+
+    onPageChanged: function(increment) {
+        this.setState({page: this.state.page + increment});
+    },
+
+    onShopsChanged: function() {
+        this.setState({page: 1});
+        this.getShops();
+    },
+
+    getShops: function() {
+        //ShopifyApp.Bar.loadingOn();
+
+        // Set up request data with filter and pagination parameters.
+        var data = $.extend({
+            'page[size]': this.props.pageSize,
+            'page[number]': this.state.page
+        }, this.props.filter);
+
+        // Make the request to fetch the order list.
+        $.getJSON(this.props.shopsUrl, data, function(result) {
+            if(this.isMounted()) {
+                this.setState({
+                    shops: result.data
+                });
+            }
+        }.bind(this))
+        .always(function() {
+            //ShopifyApp.Bar.loadingOff();
+        });
+    },
+
+    render: function() {
+        var shopRows = this.state.shops.map(function(shop) {
+            return (
+                <ShopRow shop={shop} editShopUrl={this.props.editShopUrl} key={shop.id} />
+            )
+        }.bind(this));
+
+        return (
+            <div>
+                <div className="next-card__section">
+                    <table className="table-hover expanded">
+                        <thead>
+                            <tr>
+                                <th>ID</th>
+                                <th>Shopify Domain</th>
+                                <th>Status</th>
+                                <th>Email</th>
+                                <th>Country Name</th>
+                                <th>Currency</th>
+                                <th>Domain</th>
+                                <th>Plan</th>
+                                <th>Created</th>
+                                <th>Installed Duration</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            {shopRows}
+                        </tbody>
+                    </table>
+                </div>
+                <div className="next-card__section">
+                    <div className="next-grid next-grid--no-padding next-grid--center-aligned">
+                        <div className="next-grid__cell next-grid__cell--no-flex">
+                            <ShopList.Paginator page={this.state.page} pageSize={this.props.pageSize} items={this.state.shops} onPageChanged={this.onPageChanged} />
+                        </div>
+                    </div>
+                </div>
+            </div>
+        )
+    }
+
+});
+
+/**
+ * Paginator.
+ */
+ShopList.Paginator = React.createClass({
+
+    handlePreviousClick: function(e) {
+        this.props.onPageChanged(-1);
+    },
+
+    handleNextClick: function(e) {
+        this.props.onPageChanged(1);
+    },
+
+    render: function() {
+        return (
+            <div className="btn-group" role="group">
+                <ShopList.PaginatorButton label="&lsaquo;" isDisabled={this.props.page < 2} onClick={this.handlePreviousClick} />
+                <ShopList.PaginatorButton label="&rsaquo;" isDisabled={this.props.items.length < this.props.pageSize} onClick={this.handleNextClick} />
+            </div>
+        )
+    }
+
+});
+
+/**
+ * Individual button within a paginator.
+ */
+ShopList.PaginatorButton = (props) => {
+    var className = 'btn btn-default' + (props.isDisabled ? ' disabled' : '');
+    return (
+        <button className={className} disabled={props.isDisabled} onClick={props.onClick}>{props.label}</button>
+    )
+};

data/app/assets/javascripts/disco_app/components/shop_row.js.jsx

@@ -0,0 +1,27 @@
+var ShopRow = (props) => {
+
+    var shop = props.shop,
+        editShopUrl = props.editShopUrl.replace(':id', shop.id),
+        shopifyDomain = shop.attributes['shopify_domain'],
+        countryName = shop.attributes['country_name'],
+        currency = shop.attributes['currency'],
+        domainName = shop.attributes['domain'],
+        planName = shop.attributes['plan_display_name'],
+        createdDate = shop.attributes['created_at'],
+        installedDuration = shop.attributes['installed_duration']
+
+    return (
+        <tr>
+            <td><a href={editShopUrl}>#{shop.id}</a></td>
+            <td>{shopifyDomain}</td>
+            <td>{shop.attributes.status}</td>
+            <td>{shop.attributes.email}</td>
+            <td>{countryName}</td>
+            <td>{shop.attributes.currency}</td>
+            <td>{shop.attributes.domain}</td>
+            <td>{planName}</td>
+            <td>{createdDate}</td>
+            <td>{installedDuration}</td>
+        </tr>
+    )
+};

data/app/controllers/disco_app/admin/app_settings_controller.rb

@@ -0,0 +1,3 @@
+class DiscoApp::Admin::AppSettingsController < DiscoApp::Admin::ApplicationController
+  include DiscoApp::Admin::Concerns::AppSettingsController
+end

data/app/controllers/disco_app/admin/application_controller.rb

@@ -0,0 +1,3 @@
+class DiscoApp::Admin::ApplicationController < ActionController::Base
+  include DiscoApp::Admin::Concerns::AuthenticatedController
+end

data/app/controllers/disco_app/admin/concerns/app_settings_controller.rb

@@ -0,0 +1,24 @@
+module DiscoApp::Admin::Concerns::AppSettingsController
+  extend ActiveSupport::Concern
+
+  def edit
+    @app_settings = DiscoApp::AppSettings.instance
+  end
+
+  def update
+    @app_settings = DiscoApp::AppSettings.instance
+    if @app_settings.update_attributes(app_settings_params)
+      flash[:success] = 'Settings updated.'
+      redirect_to edit_admin_app_settings_path
+    else
+      render 'edit'
+    end
+  end
+
+  private
+
+    def app_settings_params
+      params.require(:app_settings)
+    end
+
+end

data/app/controllers/disco_app/admin/concerns/authenticated_controller.rb

@@ -0,0 +1,20 @@
+module DiscoApp::Admin::Concerns::AuthenticatedController
+  extend ActiveSupport::Concern
+
+  included do
+
+    protect_from_forgery with: :exception
+    before_action :authenticate_administrator
+    layout 'admin'
+
+  end
+
+  private
+
+    def authenticate_administrator
+      authenticate_or_request_with_http_basic do |username, password|
+        (not username.blank?) && (not password.blank?) && username == ENV['ADMIN_APP_USERNAME'] && password == ENV['ADMIN_APP_PASSWORD']
+      end
+    end
+
+end

data/app/controllers/disco_app/admin/concerns/shops_controller.rb

@@ -0,0 +1,7 @@
+module DiscoApp::Admin::Concerns::ShopsController
+  extend ActiveSupport::Concern
+
+  def index
+  end
+
+end

data/app/controllers/disco_app/admin/resources/shops_controller.rb

@@ -0,0 +1,3 @@
+class DiscoApp::Admin::Resources::ShopsController < JSONAPI::ResourceController
+  include DiscoApp::Admin::Concerns::AuthenticatedController
+end

data/app/controllers/disco_app/admin/shops_controller.rb

@@ -0,0 +1,3 @@
+class DiscoApp::Admin::ShopsController < DiscoApp::Admin::ApplicationController
+  include DiscoApp::Admin::Concerns::ShopsController
+end

data/app/controllers/disco_app/charges_controller.rb

@@ -1,6 +1,6 @@
 module DiscoApp
   class ChargesController < ApplicationController
-    include DiscoApp::AuthenticatedController
+    include DiscoApp::Concerns::AuthenticatedController
 
     skip_before_action :verify_status, only: [:create, :activate]
 

data/app/controllers/disco_app/concerns/app_proxy_controller.rb

@@ -0,0 +1,40 @@
+module DiscoApp::Concerns::AppProxyController
+  extend ActiveSupport::Concern
+
+  included do
+    before_action :verify_proxy_signature
+    before_action :shopify_shop
+    after_action :add_liquid_header
+
+    rescue_from ActiveRecord::RecordNotFound do |exception|
+      render_error 404
+    end
+  end
+
+  private
+
+    def verify_proxy_signature
+      unless proxy_signature_is_valid?
+        head :unauthorized
+      end
+    end
+
+    def proxy_signature_is_valid?
+      return true if DiscoApp.configuration.skip_proxy_verification?
+      DiscoApp::ProxyService.proxy_signature_is_valid?(request.query_string, ShopifyApp.configuration.secret)
+    end
+
+    def shopify_shop
+      @shop = DiscoApp::Shop.find_by_shopify_domain!(params[:shop])
+    end
+
+    def add_liquid_header
+      response.headers['Content-Type'] = 'application/liquid'
+    end
+
+    def render_error(status)
+      add_liquid_header
+      render "disco_app/proxy_errors/#{status}", status: status
+    end
+
+end

data/app/controllers/disco_app/concerns/authenticated_controller.rb

@@ -0,0 +1,42 @@
+module DiscoApp::Concerns::AuthenticatedController
+  extend ActiveSupport::Concern
+
+  included do
+    before_action :login_again_if_different_shop
+    before_action :shopify_shop
+    before_action :verify_status
+    around_filter :shopify_session
+    layout 'embedded_app'
+  end
+
+  private
+
+    def shopify_shop
+      if shop_session
+        @shop = DiscoApp::Shop.find_by!(shopify_domain: @shop_session.url)
+      else
+        redirect_to_login
+      end
+    end
+
+    def verify_status
+      if not (@shop.charge_active? or @shop.charge_waived?)
+        redirect_if_not_current_path(disco_app.new_charge_path)
+      elsif @shop.charge_accepted?
+        redirect_if_not_current_path(disco_app.activate_charge_path)
+      elsif @shop.never_installed? or @shop.uninstalled?
+        redirect_if_not_current_path(disco_app.install_path)
+      elsif @shop.awaiting_install? or @shop.installing?
+        redirect_if_not_current_path(disco_app.installing_path)
+      elsif @shop.awaiting_uninstall? or @shop.uninstalling?
+        redirect_if_not_current_path(disco_app.uninstalling_path)
+      end
+    end
+
+    def redirect_if_not_current_path(target)
+      if request.path != target
+        redirect_to target
+      end
+    end
+
+end

data/app/controllers/disco_app/concerns/carrier_request_controller.rb

@@ -0,0 +1,21 @@
+module DiscoApp::Concerns::CarrierRequestController
+  extend ActiveSupport::Concern
+
+  included do
+    before_action :verify_carrier_request
+  end
+
+  private
+
+    def verify_carrier_request
+      unless carrier_request_signature_is_valid?
+        head :unauthorized
+      end
+    end
+
+    def carrier_request_signature_is_valid?
+      return true if DiscoApp.configuration.skip_carrier_request_verification?
+      DiscoApp::CarrierRequestService.is_valid_hmac?(request.body.read.to_s, ShopifyApp.configuration.secret, request.headers['HTTP_X_SHOPIFY_HMAC_SHA256'])
+    end
+
+end

data/app/controllers/disco_app/install_controller.rb

@@ -1,6 +1,6 @@
 module DiscoApp
   class InstallController < ApplicationController
-    include DiscoApp::AuthenticatedController
+    include DiscoApp::Concerns::AuthenticatedController
 
     # Start the installation process for the current shop, then redirect to the installing screen.
     def install

data/app/models/disco_app/app_settings.rb

@@ -0,0 +1,3 @@
+class DiscoApp::AppSettings < ActiveRecord::Base
+  include DiscoApp::Concerns::AppSettings
+end

data/app/models/disco_app/concerns/app_settings.rb

@@ -0,0 +1,7 @@
+module DiscoApp::Concerns::AppSettings
+  extend ActiveSupport::Concern
+
+  included do
+    acts_as_singleton
+  end
+end

data/app/models/disco_app/concerns/shop.rb

@@ -3,6 +3,7 @@ module DiscoApp::Concerns::Shop
 
   included do
     include ShopifyApp::Shop
+    include ActionView::Helpers::DateHelper
 
     # Define relationships to plans and subscriptions.
     has_many :subscriptions
@@ -65,6 +66,10 @@ module DiscoApp::Concerns::Shop
       "https://#{shopify_domain}/admin"
     end
 
+    def installed_duration
+      distance_of_time_in_words_to_now(created_at.time)
+    end
+
   end
 
 end

data/app/models/disco_app/concerns/{synchronises_with_shopify.rb → synchronises.rb}

@@ -1,11 +1,17 @@
-module DiscoApp::Concerns::SynchronisesWithShopify
+module DiscoApp::Concerns::Synchronises
   extend ActiveSupport::Concern
 
   class_methods do
 
-    def synchronise_from_shopify(shop, data)
+    def should_synchronise?(shop, data)
+      true
+    end
+
+    def synchronise(shop, data)
       data = data.with_indifferent_access
 
+      return unless should_synchronise?(shop, data)
+
       instance = self.find_or_create_by!(id: data[:id]) do |instance|
         instance.shop = shop
         instance.data = data
@@ -16,8 +22,15 @@ module DiscoApp::Concerns::SynchronisesWithShopify
       instance
     end
 
-    def synchronise_deletion_from_shopify(shop, data)
+    def should_synchronise_deletion?(shop, data)
+      true
+    end
+
+    def synchronise_deletion(shop, data)
       data = data.with_indifferent_access
+
+      return unless should_synchronise_deletion?(shop, data)
+
       self.destroy_all(shop: shop, id: data[:id])
     end
 

data/app/resources/disco_app/admin/resources/concerns/shop_resource.rb

@@ -0,0 +1,46 @@
+require 'jsonapi/resource'
+
+module DiscoApp::Admin::Resources::Concerns::ShopResource
+  extend ActiveSupport::Concern
+
+  included do
+
+    attributes :shopify_domain, :status, :email, :country_name
+    attributes :currency, :domain, :plan_display_name, :created_at
+    attributes :installed_duration
+
+    model_name 'DiscoApp::Shop'
+
+    filters :status
+
+    # Adjust the base records method to ensure only models for the authenticated domain are retrieved.
+    def self.records(options = {})
+      records = DiscoApp::Shop.order(created_at: :desc)
+      records
+    end
+
+    # Apply filters.
+    def self.apply_filter(records, filter, value, options)
+      return records if value.blank?
+
+      # Perform appropriate filtering.
+      case filter
+        when :status
+          return records.where(status: value.map { |v| DiscoApp::Shop.statuses[v.to_sym] } )
+        else
+          return super(records, filter, value)
+      end
+    end
+
+    # Don't allow the update of any fields via the API.
+    def self.updatable_fields(context)
+      []
+    end
+
+    # Don't allow the creation of any fields via the API.
+    def self.creatable_fields(context)
+      []
+    end
+
+  end
+end

data/app/resources/disco_app/admin/resources/shop_resource.rb

@@ -0,0 +1,4 @@
+class DiscoApp::Admin::Resources::ShopResource < JSONAPI::Resource
+  include DiscoApp::Admin::Resources::Concerns::ShopResource
+
+end

data/app/views/disco_app/admin/app_settings/edit.html.erb

@@ -0,0 +1,5 @@
+<% provide(:title, 'App Settings') %>
+
+<p>Update 'app/views/disco_app/admin/app_settings/edit.html.erb' on your own rails app.</p>
+
+

data/app/views/disco_app/admin/shops/index.html.erb

@@ -0,0 +1,12 @@
+<% provide(:title, 'Shops') %>
+
+<div class="next-grid">
+  <div class="next-grid__cell">
+
+    <%= react_component('FilterableShopList', {
+      shopsUrl: admin_resources_shops_path(format: :json),
+      editShopUrl: edit_admin_shop_path(':id')
+    }) %>
+
+  </div>
+</div>

data/app/views/layouts/admin/_navbar.html.erb

@@ -0,0 +1,24 @@
+<nav class="navbar navbar-default navbar-static-top">
+  <div class="container-fluid">
+
+    <!-- Brand & Toggle -->
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="<%= admin_shops_path %>">Credible</a>
+    </div>
+
+    <!-- Collapsing Navigation Links -->
+    <div class="collapse navbar-collapse">
+      <ul class="nav navbar-nav">
+        <%= active_link_to 'Shops', admin_shops_path, wrap_tag: :li %>
+        <%= active_link_to 'Settings', edit_admin_app_settings_path, wrap_tag: :li %>
+      </ul>
+    </div>
+
+  </div>
+</nav>