Skip to content
This repository was archived by the owner on Oct 19, 2018. It is now read-only.

Commit e62a63b

Browse files
barriehadfieldbarriehadfield
committed
all working lap28
1 parent b75e2d4 commit e62a63b

File tree

6 files changed

+45
-43
lines changed

6 files changed

+45
-43
lines changed

‎Gemfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@ gem 'opal-browser'
1515
gem 'rails', '5.1.6'
1616
gem 'opal-rails'
1717
gem 'react-rails'
18-
#gem 'hyper-router', git: 'https://github.com/janbiedermann/hyper-router.git', branch: 'edge'
19-
gem 'hyper-router', git: 'https://github.com/ruby-hyperloop/hyper-router.git', branch: 'edge'
18+
gem 'hyper-router', git: 'https://github.com/janbiedermann/hyper-router.git', branch: 'edge'
19+
# gem 'hyper-router'
2020
#gem 'hyper-router'
2121
gem 'uglifier'
2222

2323
gem 'opal-jquery', git: 'https://github.com/opal/opal-jquery.git', branch: 'master'
2424

2525
gem 'hyperloop', '1.0.0.lap28'
26+
gem 'hyper-operation', '1.0.0.lap28'
2627
gem 'hyper-spec', '1.0.0.lap28'

‎Gemfile.lock

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
GIT
2-
remote: https://github.com/opal/opal-jquery.git
3-
revision: f47a9b42da366cea270f743b05acf529f3077d35
4-
branch: master
5-
specs:
6-
opal-jquery (0.4.2)
7-
opal (>= 0.10.0, < 0.12.0)
8-
9-
GIT
10-
remote: https://github.com/ruby-hyperloop/hyper-router.git
11-
revision: 834758358805357aba4d0bdb205b62fc6d635851
2+
remote: https://github.com/janbiedermann/hyper-router.git
3+
revision: 33b076cad664ed5ff783efbf8f9ad9e9ae9f8bba
124
branch: edge
135
specs:
146
hyper-router (4.2.6.lap28)
@@ -18,6 +10,14 @@ GIT
1810
opal-rails (~> 0.9.4)
1911
react-rails (>= 2.4.0, < 2.5.0)
2012

13+
GIT
14+
remote: https://github.com/opal/opal-jquery.git
15+
revision: d15ca70f53cb323245c54842587b874945e1083e
16+
branch: master
17+
specs:
18+
opal-jquery (0.4.2)
19+
opal (>= 0.10.0, < 0.12.0)
20+
2121
GEM
2222
remote: https://rubygems.org/
2323
specs:
@@ -73,13 +73,13 @@ GEM
7373
babel-source (>= 4.0, < 6)
7474
execjs (~> 2.0)
7575
builder (3.2.3)
76-
capybara (3.0.3)
76+
capybara (3.5.0)
7777
addressable
7878
mini_mime (>= 0.1.3)
7979
nokogiri (~> 1.8)
8080
rack (>= 1.6.0)
8181
rack-test (>= 0.6.3)
82-
xpath (~> 3.0)
82+
xpath (~> 3.1)
8383
childprocess (0.9.0)
8484
ffi (~> 1.0, >= 1.0.11)
8585
chromedriver-helper (1.2.0)
@@ -90,14 +90,14 @@ GEM
9090
adamantium (~> 0.2.0)
9191
equalizer (~> 0.0.9)
9292
concurrent-ruby (1.0.5)
93-
connection_pool (2.2.1)
93+
connection_pool (2.2.2)
9494
crass (1.0.4)
9595
diff-lcs (1.3)
9696
equalizer (0.0.11)
9797
erubi (1.7.1)
9898
execjs (2.7.0)
99-
ffi (1.9.23)
100-
foreman (0.84.0)
99+
ffi (1.9.25)
100+
foreman (0.85.0)
101101
thor (~> 0.19.1)
102102
globalid (0.4.1)
103103
activesupport (>= 4.2.0)
@@ -164,7 +164,7 @@ GEM
164164
rails-dom-testing (>= 1, < 3)
165165
railties (>= 4.2.0)
166166
thor (>= 0.14, < 2.0)
167-
libv8 (6.3.292.48.1)
167+
libv8 (6.7.288.46.1)
168168
listen (3.1.5)
169169
rb-fsevent (~> 0.9, >= 0.9.4)
170170
rb-inotify (~> 0.9, >= 0.9.7)
@@ -182,12 +182,12 @@ GEM
182182
mini_racer (0.1.15)
183183
libv8 (~> 6.3)
184184
minitest (5.11.3)
185-
mutations (0.8.2)
185+
mutations (0.8.3)
186186
activesupport
187187
nio4r (2.3.1)
188-
nokogiri (1.8.2)
188+
nokogiri (1.8.4)
189189
mini_portile2 (~> 2.3.0)
190-
opal (0.11.0)
190+
opal (0.11.1)
191191
ast (>= 2.3.0)
192192
hike (~> 1.2)
193193
parser (= 2.3.3.1)
@@ -209,7 +209,7 @@ GEM
209209
opal (~> 0.11.0)
210210
sprockets (~> 3.1)
211211
tilt (>= 1.4)
212-
opal_hot_reloader (0.1.5)
212+
opal_hot_reloader (0.1.6)
213213
listen (~> 3.0)
214214
websocket
215215
paggio (0.2.6)
@@ -221,7 +221,7 @@ GEM
221221
method_source (~> 0.9.0)
222222
public_suffix (3.0.2)
223223
rack (2.0.5)
224-
rack-test (1.0.0)
224+
rack-test (1.1.0)
225225
rack (>= 1.0, < 3)
226226
rails (5.1.6)
227227
actioncable (= 5.1.6)
@@ -250,7 +250,7 @@ GEM
250250
rb-fsevent (0.10.3)
251251
rb-inotify (0.9.10)
252252
ffi (>= 0.5.0, < 2)
253-
react-rails (2.4.4)
253+
react-rails (2.4.7)
254254
babel-transpiler (>= 0.7.0)
255255
connection_pool
256256
execjs
@@ -275,11 +275,11 @@ GEM
275275
rspec-support (3.7.1)
276276
ruby_dep (1.5.0)
277277
rubyzip (1.2.1)
278-
selenium-webdriver (3.11.0)
278+
selenium-webdriver (3.14.0)
279279
childprocess (~> 0.5)
280280
rubyzip (~> 1.2)
281281
sourcemap (0.1.1)
282-
sprockets (3.7.1)
282+
sprockets (3.7.2)
283283
concurrent-ruby (~> 1.0)
284284
rack (> 1, < 3)
285285
sprockets-rails (3.2.1)
@@ -292,32 +292,33 @@ GEM
292292
timecop (0.8.1)
293293
tzinfo (1.2.5)
294294
thread_safe (~> 0.1)
295-
uglifier (4.1.10)
295+
uglifier (4.1.17)
296296
execjs (>= 0.3.0, < 3)
297-
unparser (0.2.7)
297+
unparser (0.2.8)
298298
abstract_type (~> 0.0.7)
299299
adamantium (~> 0.2.0)
300300
concord (~> 0.1.5)
301301
diff-lcs (~> 1.3)
302302
equalizer (~> 0.0.9)
303303
parser (>= 2.3.1.2, < 2.6)
304304
procto (~> 0.0.2)
305-
webdrivers (3.3.1)
305+
webdrivers (3.3.2)
306306
nokogiri (~> 1.6)
307307
rubyzip (~> 1.0)
308308
selenium-webdriver (~> 3.0)
309-
websocket (1.2.5)
309+
websocket (1.2.8)
310310
websocket-driver (0.6.5)
311311
websocket-extensions (>= 0.1.0)
312312
websocket-extensions (0.1.3)
313-
xpath (3.0.0)
313+
xpath (3.1.0)
314314
nokogiri (~> 1.8)
315315

316316
PLATFORMS
317317
ruby
318318

319319
DEPENDENCIES
320320
foreman
321+
hyper-operation (= 1.0.0.lap28)
321322
hyper-router!
322323
hyper-spec (= 1.0.0.lap28)
323324
hyperloop (= 1.0.0.lap28)
@@ -334,4 +335,4 @@ DEPENDENCIES
334335
uglifier
335336

336337
BUNDLED WITH
337-
1.16.1
338+
1.16.3

‎app/components/shared/app_menu.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class AppMenu < Hyperloop::Router::Component
5757
end
5858

5959
Sem.MenuItem {
60-
IFRAME(class: 'github', src: 'http://ghbtns.com/github-btn.html?user=ruby-hyperloop&repo=hyperloop&type=watch&count=true', allowTransparency: 'true', frameBorder: '0', scrolling: '0', width: '100', height: '20')
60+
IFRAME(class: 'github', src: 'http://ghbtns.com/github-btn.html?user=ruby-hyperloop&repo=hyperloop&type=watch&count=true', frameBorder: '0', scrolling: '0', width: '100', height: '20')
6161
}
6262

6363
end

‎app/stores/site_store.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def init
2727
load_installation_section
2828
load_gems_section
2929
load_tools_section
30-
load_tutorials_section
30+
# load_tutorials_section
3131
end
3232

3333
def load_start_section
@@ -92,7 +92,7 @@ def load_tutorials_section
9292
pages = [
9393
{ id: 0, name: 'helloworld', repo: 'hyperloop-website', file: 'pages/tutorial/helloworld.md', allow_edit: true },
9494
{ id: 1, name: 'todo', repo: 'todo-tutorial', file: 'README.md', allow_edit: true }
95-
95+
9696
]
9797
@section_stores[section_name] = SectionStore.new(pages, section_name)
9898
end

‎package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@
3333
"react-burger-menu": "^2.3.0",
3434
"react-codemirror": "^1.0.0",
3535
"react-dom": "16.2.0",
36-
"react-router": "^4.2.0",
37-
"react-router-dom": "^4.2.2",
36+
"react-router": "^4.3.1",
37+
"react-router-dom": "^4.3.1",
3838
"react-stickynode": "^1.4.1",
39-
"ruby-hyperloop": "0.0.24",
39+
"ruby-hyperloop": "0.0.28",
4040
"semantic-ui-react": "0.78.3"
4141
}
4242
}

‎yarn.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2509,7 +2509,7 @@ react-dom@16.2.0:
25092509
object-assign "^4.1.1"
25102510
prop-types "^15.6.0"
25112511

2512-
react-router-dom@^4.2.2:
2512+
react-router-dom@^4.2.2, react-router-dom@^4.3.1:
25132513
version "4.3.1"
25142514
resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-4.3.1.tgz#4c2619fc24c4fa87c9fd18f4fb4a43fe63fbd5c6"
25152515
dependencies:
@@ -2520,7 +2520,7 @@ react-router-dom@^4.2.2:
25202520
react-router "^4.3.1"
25212521
warning "^4.0.1"
25222522

2523-
react-router@^4.2.0, react-router@^4.3.1:
2523+
react-router@^4.3.1:
25242524
version "4.3.1"
25252525
resolved "https://registry.yarnpkg.com/react-router/-/react-router-4.3.1.tgz#aada4aef14c809cb2e686b05cee4742234506c4e"
25262526
dependencies:
@@ -2702,9 +2702,9 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
27022702
hash-base "^3.0.0"
27032703
inherits "^2.0.1"
27042704

2705-
ruby-hyperloop@0.0.24:
2706-
version "0.0.24"
2707-
resolved "https://registry.yarnpkg.com/ruby-hyperloop/-/ruby-hyperloop-0.0.24.tgz#7d2972f4b64165970775d076549c238da638fe75"
2705+
ruby-hyperloop@0.0.28:
2706+
version "0.0.28"
2707+
resolved "https://registry.yarnpkg.com/ruby-hyperloop/-/ruby-hyperloop-0.0.28.tgz#7b021cbe8e86729c72365111ed19bb7100e17333"
27082708
dependencies:
27092709
react "^15.6.1"
27102710
react-router-dom "^4.2.2"

0 commit comments

Comments
 (0)