disco_app 0.10.1 → 0.10.2

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 40cd49bbcbb382cf534d7b92d20b3235d75dfd1d8c0543fcc9829ec3895af6ac
4
- data.tar.gz: 7b5457cb9d1d4d6ea0880ba979535d326e255d5b992fec7390f83a3c0dbdbbe3
3
+ metadata.gz: 7b06803642b1388f4c97379b2d3f902e0fea4727d65416a5a94d596a7be90ec4
4
+ data.tar.gz: f8942efa1c985ed773659020b78b57a3380be725b7031278b509e35ae619a6a8
5
5
  SHA512:
6
- metadata.gz: 2f18163091ba171e4ef44f0563b7815d70c46ecdd93341aaa1d6a0525ea3face8fb7da2213c481721432d4005c98786e5dc7f25f328e0317c2df4ca0a4eae090
7
- data.tar.gz: b9f7ebc827d2b16293c2a9ef260ce5c879c19b43f67b429e5e909f09382cb9c85297a04208af62db6b6691de2c8d7bfe900700396cedd8d217894cb059fdcb99
6
+ metadata.gz: ead66a8df351c001bd78537ff3a081f9f86d2664fc0305dcdd578fb0ab2d02a47c5e3ce2112b3e4da561e077fbdacf1a52b285eb125036b128ca36d66fdbaba9
7
+ data.tar.gz: 6aefd207f8162943cd9d9165030333752022af6ccbcf0dd634173fa8536f02a21430db45584daedd350f5a8766ef5e71b855843a36f22fa38b722398693c8197
@@ -1,26 +1,28 @@
1
- <% provide(:title, 'Install') %>
1
+ <% provide(:title, "Install #{DiscoApp.configuration.app_name}") %>
2
2
 
3
3
  <%= form_tag shopify_app.login_path do %>
4
- <div class="modal-dialog">
5
- <div class="modal-content">
6
- <div class="modal-body">
7
-
8
- <% flash.each do |message_type, message| %>
9
- <div class="alert alert-<%= message_type %>"><%= message %></div>
10
- <% end %>
11
-
12
- <div class="form-group">
13
- <div class="input-group">
14
- <div class="input-group-addon">http://</div>
15
- <input type="text" class="form-control" id="shop" name="shop" placeholder="your-store" autocomplete="off" autofocus="on" />
16
- <div class="input-group-addon">.myshopify.com</div>
17
- </div>
4
+ <div class="ui-empty-state">
5
+ <section class="ui-empty-state__section">
6
+ <div class="ui-empty-state__subsection">
7
+ <h1 class="ui-empty-state__title">Install <%= DiscoApp.configuration.app_name %></h1>
8
+ <h2 class="ui-empty-state__subtitle">Enter your Shopify store name below to get started.</h2>
9
+ </div>
10
+ <div class="ui-empty-state__subsection">
11
+ <div class="next-grid">
12
+ <div class="next-grid__cell" style="text-align: right;">
13
+ <label for="shop" class="next-input__help-text">https://</label>
14
+ </div>
15
+ <div class="next-grid__cell">
16
+ <input type="text" class="form-control" id="shop" name="shop" placeholder="your-store" autocomplete="off" autofocus="on" />
17
+ </div>
18
+ <div class="next-grid__cell" style="text-align: left;">
19
+ <label for="shop" class="next-input__help-text">.myshopify.com</label>
18
20
  </div>
19
-
20
- </div>
21
- <div class="modal-footer">
22
- <button type="submit" class="btn btn-primary">Install</button>
23
21
  </div>
24
22
  </div>
25
- </div>
23
+ <div class="ui-empty-state__subsection">
24
+ <button type="submit" class="btn btn-large btn-primary">Install</button>
25
+ </div>
26
+ </section>
27
+ </div>
26
28
  <% end %>
data/config/routes.rb CHANGED
@@ -1,3 +1,5 @@
1
+ require 'sidekiq/web'
2
+
1
3
  DiscoApp::Engine.routes.draw do
2
4
 
3
5
  get 'ref', to: '/sessions#referral'
@@ -38,6 +40,19 @@ DiscoApp::Engine.routes.draw do
38
40
  end
39
41
  end
40
42
 
43
+ # Make the Sidekiq Web UI accessible using the same credentials as the admin.
44
+ if Rails.env.production?
45
+ Sidekiq::Web.use Rack::Auth::Basic do |username, password|
46
+ [
47
+ ENV['ADMIN_APP_USERNAME'].present?,
48
+ username == ENV['ADMIN_APP_USERNAME'] == username,
49
+ ENV['ADMIN_APP_PASSWORD'].present?,
50
+ password == ENV['ADMIN_APP_PASSWORD'] == username,
51
+ ].all?
52
+ end
53
+ mount Sidekiq::Web, at: '/sidekiq'
54
+ end
55
+
41
56
  # Make the embedded app frame emulator available in development.
42
57
  if Rails.env.development?
43
58
  controller :frame do
@@ -1,3 +1,3 @@
1
1
  module DiscoApp
2
- VERSION = '0.10.1'
2
+ VERSION = '0.10.2'
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: disco_app
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.10.1
4
+ version: 0.10.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Gavin Ballard
@@ -248,6 +248,20 @@ dependencies:
248
248
  - - ">="
249
249
  - !ruby/object:Gem::Version
250
250
  version: 1.3.0
251
+ - !ruby/object:Gem::Dependency
252
+ name: sinatra
253
+ requirement: !ruby/object:Gem::Requirement
254
+ requirements:
255
+ - - ">="
256
+ - !ruby/object:Gem::Version
257
+ version: 1.4.7
258
+ type: :runtime
259
+ prerelease: false
260
+ version_requirements: !ruby/object:Gem::Requirement
261
+ requirements:
262
+ - - ">="
263
+ - !ruby/object:Gem::Version
264
+ version: 1.4.7
251
265
  - !ruby/object:Gem::Dependency
252
266
  name: sqlite3
253
267
  requirement: !ruby/object:Gem::Requirement