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.

Sign up for GitHub

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

Jump to bottom

lock v10 update, dependencies update #41

Merged
merged 5 commits into from
Jul 21, 2016
Merged

lock v10 update, dependencies update #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
846967f
dependencies updated at example project
vmartynets Jun 20, 2016
9bc023d
lock v10 update, dependencies update
vmartynets Jul 7, 2016
e979369
Merge branch 'master' into lock_v10
vmartynets Jul 12, 2016
618d454
fixed travis
vmartynets Jul 12, 2016
6fa9781
lock version updated
vmartynets Jul 21, 2016
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
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
language: ruby
rvm:
- 2.1.0
- 2.2.2
6 changes: 3 additions & 3 deletions examples/ruby-on-rails-webapp/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ gem 'sqlite3', group: :development
gem 'pry', group: :development
gem 'pg'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 4.0.5'
gem 'sass-rails', '~> 5.0.4'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 2.7.2'
# Use CoffeeScript for .js.coffee assets and views
gem 'coffee-rails', '~> 4.0.0'
gem 'coffee-rails', '~> 4.1.1'
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby

Expand All @@ -33,7 +33,7 @@ gem 'spring', group: :development
gem 'omniauth', '~> 1.3.1'
gem 'omniauth-auth0', '~> 1.4.1'

gem 'dotenv', '~> 0.11.1', group: :development
gem 'dotenv', '~> 2.1.0', group: :development

# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'
Expand Down
14 changes: 8 additions & 6 deletions examples/ruby-on-rails-webapp/app/assets/javascripts/home.js.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
var lock = new Auth0Lock('<%= Rails.application.secrets.auth0_client_id %>', '<%= Rails.application.secrets.auth0_domain %>');
function signin() {
lock.show({
callbackURL: 'http://localhost:3000/auth/auth0/callback', // use this in production '<%= Rails.application.secrets.auth0_callback_url %>'
var lock = new Auth0Lock('<%= Rails.application.secrets.auth0_client_id %>', '<%= Rails.application.secrets.auth0_domain %>', {
auth: {
redirectUrl: 'http://localhost:3000/auth/auth0/callback', // use this in production '<%= Rails.application.secrets.auth0_callback_url %>'
responseType: 'code',
authParams: {
params: {
scope: 'openid name email picture'
}
});
}
});
function signin() {
lock.show();
}
6 changes: 3 additions & 3 deletions examples/ruby-on-rails-webapp/app/views/layouts/application.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<title>RubyOnRailsWebapp</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<%= yield :cdn_code %>
<%= stylesheet_link_tag '//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css' %>
<%= stylesheet_link_tag '//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css' %>
<%= javascript_include_tag '//cdn.auth0.com/js/lock-9.0.min.js' %>
<%= stylesheet_link_tag '//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css' %>
<%= stylesheet_link_tag '//maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css' %>
<%= javascript_include_tag '//cdn.auth0.com/js/lock/10.0/lock.min.js' %>
<%= javascript_include_tag '//use.typekit.net/iws6ohy.js' %>
<script type="text/javascript">try{Typekit.load();}catch(e){}</script>

Expand Down