Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use Language Ontology API in front-end (proof of concept, do not merge) #306

Open
wants to merge 35 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
8748959
[setup-videos-page] create videos controller and view
Mar 4, 2018
1b6e742
Remove node_modules
andyzg Mar 4, 2018
74b0321
Update package.json, set up starting files
andyzg Mar 4, 2018
26275e2
my bad
andyzg Mar 4, 2018
24c7a2f
Setup stylus
andyzg Mar 4, 2018
50e4932
Added styling
andyzg Mar 11, 2018
68c19eb
Modify CSS
andyzg Mar 11, 2018
7e38139
Added video grids
andyzg Mar 11, 2018
88d0a5e
Remove compiled assets
andyzg Mar 11, 2018
7f3a2cf
Added README
andyzg Mar 11, 2018
6cb70ed
Started video page
andyzg Mar 18, 2018
cbede59
Removed video react, finished video page
andyzg Mar 18, 2018
f8980cb
created video components
Mar 18, 2018
ab65b60
Merge branch 'setup_videos_page'
Mar 18, 2018
f9bb64e
Load data from CSV as placeholder
imruahmed Mar 20, 2018
417beeb
Merge pull request #2 from uwblueprint/load_dummy_data
imruahmed Mar 21, 2018
e2fafde
initial setup
Mar 22, 2018
cccaaf6
render video focus view
Mar 22, 2018
3d030a4
finalize react component
Mar 23, 2018
966fa9e
finalize videos controller
Mar 23, 2018
a979ae5
fix quotation marks
Mar 23, 2018
a85b7a1
remove comments
Mar 23, 2018
6bc2b2a
make sure /videos/index is a valid route
Mar 23, 2018
69e26e1
Merge pull request #3 from uwblueprint/set_up_video_controller
mgyliu Mar 23, 2018
7ab1934
Prepare for demo, modify title, add icon, add navigation between list…
andyzg Mar 23, 2018
d562ace
Add back img
andyzg Mar 23, 2018
b74f9dd
Use proper video thumbnail
andyzg Mar 23, 2018
e620612
Merge pull request #4 from uwblueprint/prep-demo
andyzg Mar 23, 2018
8987b10
Added video urls
andyzg Apr 26, 2018
fd082f0
Add functionality to frontend, comments
andyzg Apr 26, 2018
a1165e7
If SRT url exists, add
andyzg Apr 26, 2018
2d3fc3b
Front-end sends language ID in requests, autosuggests languages
baieric May 22, 2018
2dc2810
Update from wikitongues/master
uti0mnia Jun 3, 2018
d2b949e
Merge pull request #7 from uwblueprint/update-fork
uti0mnia Jun 6, 2018
cddb952
Merge branch 'master' into ontology-fe
Jun 19, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ gem 'rails_12factor', group: :production
gem 'puma'

gem 'active_model_serializers', '~> 0.10.0'

gem 'react-autocomplete-rails'

# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'

Expand Down
172 changes: 91 additions & 81 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ GEM
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
active_model_serializers (0.10.7)
active_model_serializers (0.10.4)
actionpack (>= 4.1, < 6)
activemodel (>= 4.1, < 6)
case_transform (>= 0.2)
jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
jsonapi (= 0.1.1.beta6)
activejob (4.2.7.1)
activesupport (= 4.2.7.1)
globalid (>= 0.3.0)
Expand All @@ -41,40 +41,40 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
addressable (2.5.0)
public_suffix (~> 2.0, >= 2.0.2)
arel (6.0.4)
aws-sdk (2.11.32)
aws-sdk-resources (= 2.11.32)
aws-sdk-core (2.11.32)
aws-sdk (2.7.2)
aws-sdk-resources (= 2.7.2)
aws-sdk-core (2.7.2)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
aws-sdk-resources (2.11.32)
aws-sdk-core (= 2.11.32)
aws-sigv4 (1.0.2)
aws-sdk-resources (2.7.2)
aws-sdk-core (= 2.7.2)
aws-sigv4 (1.0.0)
babel-source (5.8.35)
babel-transpiler (0.7.0)
babel-source (>= 4.0, < 6)
execjs (~> 2.0)
bcrypt (3.1.11)
binding_of_caller (0.8.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
browserify-rails (4.2.0)
browserify-rails (3.4.0)
addressable (>= 2.4.0)
railties (>= 4.0.0, < 5.2)
sprockets (>= 3.6.0)
railties (>= 4.0.0, < 5.1)
sprockets (>= 3.5.2)
builder (3.2.3)
byebug (10.0.2)
capybara (3.0.1)
byebug (9.0.6)
capybara (2.12.0)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
xpath (~> 3.0)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
case_transform (0.2)
activesupport
coderay (1.1.2)
coderay (1.1.1)
coffee-rails (4.1.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.1.x)
Expand All @@ -84,68 +84,76 @@ GEM
coffee-script-source (1.12.2)
concurrent-ruby (1.0.5)
connection_pool (2.2.1)
crass (1.0.4)
debug_inspector (0.0.3)
devise (4.4.3)
crass (1.0.3)
debug_inspector (0.0.2)
devise (4.2.0)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0, < 6.0)
railties (>= 4.1.0, < 5.1)
responders
warden (~> 1.2.3)
diff-lcs (1.3)
docile (1.3.0)
dotenv (2.2.2)
dotenv-rails (2.2.2)
dotenv (= 2.2.2)
railties (>= 3.2, < 6.0)
docile (1.1.5)
dotenv (2.1.2)
dotenv-rails (2.1.2)
dotenv (= 2.1.2)
railties (>= 3.2, < 5.1)
erubis (2.7.0)
execjs (2.7.0)
factory_girl (4.9.0)
factory_girl (4.8.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.9.0)
factory_girl (~> 4.9.0)
factory_girl_rails (4.8.0)
factory_girl (~> 4.8.0)
railties (>= 3.0.0)
globalid (0.4.1)
activesupport (>= 4.2.0)
i18n (0.9.5)
i18n (0.9.1)
concurrent-ruby (~> 1.0)
jbuilder (2.7.0)
activesupport (>= 4.2.0)
multi_json (>= 1.2)
jmespath (1.4.0)
jquery-rails (4.3.1)
jbuilder (2.6.1)
activesupport (>= 3.0.0, < 5.1)
multi_json (~> 1.2)
jmespath (1.3.1)
jquery-rails (4.2.2)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.6)
jsonapi-renderer (0.2.0)
jsonapi (0.1.1.beta6)
jsonapi-parser (= 0.1.1.beta3)
jsonapi-renderer (= 0.1.1.beta1)
jsonapi-parser (0.1.1.beta3)
jsonapi-renderer (0.1.1.beta1)
launchy (2.4.3)
addressable (~> 2.3)
libv8 (3.16.14.19)
lodash-rails (4.17.5)
libv8 (3.16.14.17)
lodash-rails (4.17.2)
railties (>= 3.1)
loofah (2.2.2)
loofah (2.1.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.0)
mini_mime (>= 0.1.1)
method_source (0.9.0)
method_source (0.8.2)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_mime (1.0.0)
mini_portile2 (2.3.0)
minitest (5.11.3)
multi_json (1.13.1)
nokogiri (1.8.2)
minitest (5.11.1)
multi_json (1.12.1)
nokogiri (1.8.1)
mini_portile2 (~> 2.3.0)
orm_adapter (0.5.0)
pg (0.21.0)
pry (0.11.3)
pg (0.19.0)
pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
public_suffix (3.0.2)
puma (3.11.3)
method_source (~> 0.8.1)
slop (~> 3.4)
public_suffix (2.0.5)
puma (3.8.2)
pundit (1.1.0)
activesupport (>= 3.0.0)
rack (1.6.9)
rack (1.6.8)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.7.1)
Expand All @@ -165,8 +173,8 @@ GEM
activesupport (>= 4.2.0, < 5.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
Expand All @@ -177,8 +185,9 @@ GEM
activesupport (= 4.2.7.1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.3.1)
rake (12.3.0)
rdoc (4.3.0)
react-autocomplete-rails (1.3.1)
react-rails (1.5.0)
babel-transpiler (>= 0.7.0)
coffee-script-source (~> 1.8)
Expand All @@ -187,36 +196,36 @@ GEM
rails (>= 3.2)
tilt
ref (2.0.0)
responders (2.4.0)
actionpack (>= 4.2.0, < 5.3)
railties (>= 4.2.0, < 5.3)
rspec-core (3.7.1)
rspec-support (~> 3.7.0)
rspec-expectations (3.7.0)
responders (2.3.0)
railties (>= 4.2.0, < 5.1)
rspec-core (3.5.4)
rspec-support (~> 3.5.0)
rspec-expectations (3.5.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.7.0)
rspec-mocks (3.7.0)
rspec-support (~> 3.5.0)
rspec-mocks (3.5.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.7.0)
rspec-rails (3.7.2)
rspec-support (~> 3.5.0)
rspec-rails (3.5.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 3.7.0)
rspec-expectations (~> 3.7.0)
rspec-mocks (~> 3.7.0)
rspec-support (~> 3.7.0)
rspec-support (3.7.1)
rspec-core (~> 3.5.0)
rspec-expectations (~> 3.5.0)
rspec-mocks (~> 3.5.0)
rspec-support (~> 3.5.0)
rspec-support (3.5.0)
sdoc (0.4.2)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
shoulda-matchers (3.1.2)
shoulda-matchers (3.1.1)
activesupport (>= 4.0.0)
simplecov (0.16.1)
docile (~> 1.1)
simplecov (0.13.0)
docile (~> 1.1.0)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
simplecov-html (0.10.0)
slop (3.6.0)
spring (2.0.2)
activesupport (>= 4.2)
sprockets (3.7.1)
Expand All @@ -235,10 +244,10 @@ GEM
ref
thor (0.20.0)
thread_safe (0.3.6)
tilt (2.0.8)
tzinfo (1.2.5)
tilt (2.0.6)
tzinfo (1.2.4)
thread_safe (~> 0.1)
uglifier (4.1.8)
uglifier (3.0.4)
execjs (>= 0.3.0, < 3)
warden (1.2.7)
rack (>= 1.0)
Expand All @@ -248,8 +257,8 @@ GEM
railties (>= 4.0)
sprockets-rails (>= 2.0, < 4.0)
will_paginate (3.1.6)
xpath (3.0.0)
nokogiri (~> 1.8)
xpath (2.0.0)
nokogiri (~> 1.3)

PLATFORMS
ruby
Expand All @@ -274,6 +283,7 @@ DEPENDENCIES
pundit
rails (= 4.2.7.1)
rails_12factor
react-autocomplete-rails
react-rails (~> 1.5.0)
rspec-rails (~> 3.4)
sdoc (~> 0.4.0)
Expand Down
3 changes: 2 additions & 1 deletion app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,5 @@
//= require react
//= require react_ujs
//= require components
//= require_tree .
//= require_tree .
//= require react-autocomplete
Loading