diff --git a/handlebars/bin/templates.js b/handlebars/bin/templates.js index 2dfee9c..d638a71 100644 --- a/handlebars/bin/templates.js +++ b/handlebars/bin/templates.js @@ -458,7 +458,7 @@ function program12(depth0,data) { return " class=\"active\"";} - buffer += "
\n
\n
\n
\n LTI of Magic\n
\n
    \n \n
    \n
    \n Edu Apps\n
    \n
      \n
      - LTI of Magic + Edu Apps
        Home diff --git a/lib/apps.rb b/lib/apps.rb index 9fa8b1d..2758908 100644 --- a/lib/apps.rb +++ b/lib/apps.rb @@ -61,6 +61,13 @@ def self.registered(app) json_result(result.to_json) end + app.post "/api/v1/filter" do + halt 400, {:error => "Not logged in"}.to_json unless session['user_key'] + @filter = AppFilter.first_or_new(:username => "@#{session['user_key']}") + @filter.update_settings(params) + json_result(@filter.to_json) + end + # review an app app.post "/api/v1/apps/:tool_id/reviews" do host = request.scheme + "://" + request.host_with_port @@ -94,23 +101,6 @@ def self.registered(app) json_result(json.to_json) end - # deprecated - app.get "/data/lti_examples.jsonp" do - json = App.load_apps.to_json - return "#{params['callback'] || 'callback'}(#{json})" - end - - # deprecated - app.get "/data/lti_apps.json" do - return apps_list(request, false).to_json - end - - # deprecated - app.get "/data/lti_apps.jsonp" do - return "#{params['callback'] || 'callback'}(#{apps_list(request, false).to_json})" - end - - app.get "/data/app_reviews.atom" do reviews = AppReview.all(:created_at.gt => (Date.today - 60), :order => :id.desc) host = request.scheme + "://" + request.host_with_port @@ -199,8 +189,9 @@ def apps_list(request, paginated=true) limit = 24 params = request.params offset = params['offset'].to_i + filter = AppFilter.first(:code => params['filter']) - data = App.load_apps.sort_by{|a| [(0 - (a['uses'] || 0)), a['name'].downcase || 'zzz'] } + data = App.load_apps(filter).sort_by{|a| [(0 - (a['uses'] || 0)), a['name'].downcase || 'zzz'] } [['category', 'categories'], ['level', 'levels'], ['extension', 'extensions']].each do |filter, key| if params[filter] && params[filter].length > 0 if params[filter] == 'all' @@ -251,7 +242,7 @@ def apps_list(request, paginated=true) if paginated next_url = data.length > offset + limit ? (host + "/api/v1/apps?offset=#{offset + limit}") : nil if next_url - ['no_meta', 'category', 'level', 'extension', 'recent', 'public', 'platform', 'pending'].each do |key| + ['filter', 'no_meta', 'category', 'level', 'extension', 'recent', 'public', 'platform', 'pending'].each do |key| next_url += "&#{key}=#{CGI.escape(params[key])}" if params[key] end response.headers['Link'] = "<#{next_url}>; rel=\"next\"" diff --git a/lib/main.rb b/lib/main.rb index 58d0934..1b51193 100644 --- a/lib/main.rb +++ b/lib/main.rb @@ -40,6 +40,11 @@ def self.registered(app) end end + app.get "/index.html" do + @sheets = ['loading', 'index'] + erb :index + end + app.get "/twitter.html" do redirect to("/tools/twitter/index.html") end diff --git a/lib/models.rb b/lib/models.rb index 82b33eb..6f01519 100644 --- a/lib/models.rb +++ b/lib/models.rb @@ -73,6 +73,38 @@ class LaunchRedirect property :launches, Integer end +class AppFilter + include DataMapper::Resource + property :id, Serial + property :username, String + property :code, String, :length => 1024 + property :settings, Json + + def update_settings(params) + self.settings = {} + self.code ||= Digest::MD5.hexdigest(self.username + Time.now.to_i.to_s + rand(9999).to_s) + self.settings['app_ids'] = {} + self.settings['allow_new'] = params['allow_new'] == true || params['allow_new'] == '1' + App.load_apps.each do |app| + self.settings['app_ids'][app['id']] = false + end + (params['app_ids'] || []).each do |id| + self.settings['app_ids'][id] = true + end + self.save + end + + def as_json + res = self.settings || {} + res['code'] = self.code + res + end + + def to_json + as_json.to_json + end +end + class App include DataMapper::Resource property :id, Serial @@ -156,9 +188,13 @@ def update_counts self.save end - def self.load_apps -# json_apps = JSON.parse(File.read('./public/data/lti_examples.json')).select{|a| !a['pending'] } - data_apps = App.all(:pending => false).select{|a| a.settings }.map{|a| a.settings } + def self.load_apps(filter=nil) + allow_new = true if !filter + lookups = ((filter && filter.settings) || {})['app_ids'] || {} + allow_new = (filter.settings['allow_new'] || false) if filter + data_apps = App.all(:pending => false).select{|a| + a.settings && lookups[a.settings['id']] != false && (allow_new || lookups[a.settings['id']] == true ) + }.map{|a| a.settings } end def self.build_or_update(id, params, admin_permission, user_key=nil) diff --git a/public/common.css b/public/common.css index 779c047..149e324 100644 --- a/public/common.css +++ b/public/common.css @@ -97,3 +97,9 @@ span.stars.star4_5 img.star5 { .filters select { margin-right: 20px; } +label.app { + opacity: 0.5; +} +label.app.selected { + opacity: 1.0; +} \ No newline at end of file diff --git a/public/common.js b/public/common.js index af74b03..d1dd830 100644 --- a/public/common.js +++ b/public/common.js @@ -824,7 +824,7 @@ function program12(depth0,data) { return " class=\"active\"";} - buffer += "
        \n
        \n
        \n
        \n LTI of Magic\n
        \n
          \n \n
          \n
          \n Edu Apps\n
          \n
            \n - LTI Apps + Edu Apps @@ -122,7 +122,7 @@
            -

            LTI Apps

            +

            Edu Apps

            Awesome stuff happens with LTI™. You know this is true. Here's a collection of LTI apps you can use in your classes today. diff --git a/public/talk.html b/public/talk.html index 42f0e6f..02789e0 100644 --- a/public/talk.html +++ b/public/talk.html @@ -50,42 +50,13 @@

            LTI Talk

            - -
            - - + +
            + +
            -
            diff --git a/public/tools/badge_stack/banner.png b/public/tools/badge_stack/banner.png new file mode 100644 index 0000000..36c3830 Binary files /dev/null and b/public/tools/badge_stack/banner.png differ diff --git a/public/tools/badge_stack/logo.png b/public/tools/badge_stack/logo.png new file mode 100644 index 0000000..85a8c9f Binary files /dev/null and b/public/tools/badge_stack/logo.png differ diff --git a/public/tools/book_shelf/banner.png b/public/tools/book_shelf/banner.png new file mode 100644 index 0000000..09029da Binary files /dev/null and b/public/tools/book_shelf/banner.png differ diff --git a/public/tools/book_shelf/logo.png b/public/tools/book_shelf/logo.png new file mode 100644 index 0000000..73c0710 Binary files /dev/null and b/public/tools/book_shelf/logo.png differ diff --git a/public/tools/echo_center/banner.png b/public/tools/echo_center/banner.png new file mode 100644 index 0000000..5ed6810 Binary files /dev/null and b/public/tools/echo_center/banner.png differ diff --git a/public/tools/echo_center/logo.png b/public/tools/echo_center/logo.png new file mode 100644 index 0000000..495a59a Binary files /dev/null and b/public/tools/echo_center/logo.png differ diff --git a/public/tools/evaluation_kit/banner.png b/public/tools/evaluation_kit/banner.png new file mode 100644 index 0000000..c847e1c Binary files /dev/null and b/public/tools/evaluation_kit/banner.png differ diff --git a/public/tools/evaluation_kit/logo.png b/public/tools/evaluation_kit/logo.png new file mode 100644 index 0000000..8bef049 Binary files /dev/null and b/public/tools/evaluation_kit/logo.png differ diff --git a/public/tools/harvard_pub/banner.png b/public/tools/harvard_pub/banner.png new file mode 100644 index 0000000..779f4b3 Binary files /dev/null and b/public/tools/harvard_pub/banner.png differ diff --git a/public/tools/harvard_pub/logo.png b/public/tools/harvard_pub/logo.png new file mode 100644 index 0000000..867137e Binary files /dev/null and b/public/tools/harvard_pub/logo.png differ diff --git a/public/tools/learning_com/banner.png b/public/tools/learning_com/banner.png new file mode 100644 index 0000000..b639211 Binary files /dev/null and b/public/tools/learning_com/banner.png differ diff --git a/public/tools/learning_com/logo.png b/public/tools/learning_com/logo.png new file mode 100644 index 0000000..258b9d6 Binary files /dev/null and b/public/tools/learning_com/logo.png differ diff --git a/public/tools/media_core/banner.png b/public/tools/media_core/banner.png new file mode 100644 index 0000000..176a66b Binary files /dev/null and b/public/tools/media_core/banner.png differ diff --git a/public/tools/media_core/logo.png b/public/tools/media_core/logo.png new file mode 100644 index 0000000..28ea3d4 Binary files /dev/null and b/public/tools/media_core/logo.png differ diff --git a/public/tools/mediasite/banner.png b/public/tools/mediasite/banner.png new file mode 100644 index 0000000..73d8bd2 Binary files /dev/null and b/public/tools/mediasite/banner.png differ diff --git a/public/tools/odyssey/.DS_Store b/public/tools/odyssey/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/public/tools/odyssey/.DS_Store differ diff --git a/public/tools/odyssey/banner.png b/public/tools/odyssey/banner.png new file mode 100644 index 0000000..a1fc854 Binary files /dev/null and b/public/tools/odyssey/banner.png differ diff --git a/public/tools/odyssey/logo.png b/public/tools/odyssey/logo.png new file mode 100644 index 0000000..2dcfe7a Binary files /dev/null and b/public/tools/odyssey/logo.png differ diff --git a/public/tools/pathbrite/banner.png b/public/tools/pathbrite/banner.png new file mode 100644 index 0000000..afc3e6a Binary files /dev/null and b/public/tools/pathbrite/banner.png differ diff --git a/public/tools/pebble_pad/banner.png b/public/tools/pebble_pad/banner.png new file mode 100644 index 0000000..0b8def6 Binary files /dev/null and b/public/tools/pebble_pad/banner.png differ diff --git a/public/tools/smart_thinking/banner.png b/public/tools/smart_thinking/banner.png new file mode 100644 index 0000000..68febd4 Binary files /dev/null and b/public/tools/smart_thinking/banner.png differ diff --git a/public/tools/smart_thinking/logo.png b/public/tools/smart_thinking/logo.png new file mode 100644 index 0000000..72f4cc9 Binary files /dev/null and b/public/tools/smart_thinking/logo.png differ diff --git a/public/tools/sword/banner.png b/public/tools/sword/banner.png new file mode 100644 index 0000000..ab5ca4d Binary files /dev/null and b/public/tools/sword/banner.png differ diff --git a/public/tools/sword/logo.png b/public/tools/sword/logo.png new file mode 100644 index 0000000..baaa5cc Binary files /dev/null and b/public/tools/sword/logo.png differ diff --git a/public/tools/taskstream/banner.png b/public/tools/taskstream/banner.png new file mode 100644 index 0000000..46096f8 Binary files /dev/null and b/public/tools/taskstream/banner.png differ diff --git a/public/tools/taskstream/logo.png b/public/tools/taskstream/logo.png new file mode 100644 index 0000000..28808d8 Binary files /dev/null and b/public/tools/taskstream/logo.png differ diff --git a/public/tools/toolwire/banner.png b/public/tools/toolwire/banner.png new file mode 100644 index 0000000..0922c7d Binary files /dev/null and b/public/tools/toolwire/banner.png differ diff --git a/public/tools/toolwire/logo.png b/public/tools/toolwire/logo.png new file mode 100644 index 0000000..407bd4a Binary files /dev/null and b/public/tools/toolwire/logo.png differ diff --git a/public/tools/ucertify/banner.png b/public/tools/ucertify/banner.png new file mode 100644 index 0000000..796c09c Binary files /dev/null and b/public/tools/ucertify/banner.png differ diff --git a/public/tools/ucertify/logo.png b/public/tools/ucertify/logo.png new file mode 100644 index 0000000..b552fcc Binary files /dev/null and b/public/tools/ucertify/logo.png differ diff --git a/public/tools/web_assign/banner.png b/public/tools/web_assign/banner.png new file mode 100644 index 0000000..e89a140 Binary files /dev/null and b/public/tools/web_assign/banner.png differ diff --git a/public/tools/web_assign/logo.png b/public/tools/web_assign/logo.png new file mode 100644 index 0000000..7a65517 Binary files /dev/null and b/public/tools/web_assign/logo.png differ diff --git a/public/tutorials.html b/public/tutorials.html index 5e74851..af6b85e 100644 --- a/public/tutorials.html +++ b/public/tutorials.html @@ -73,7 +73,7 @@

            Configuring Apps in Canvas

            link configuration (copy the URL from one of the links below).

            After the app is saved you should see it appear as configured in the - course our account content. Depending on the integration type, the app + course or account content. Depending on the integration type, the app may appear different places, but most apps will appear under "External Tools" when adding items to a module.

            diff --git a/spec/apps_spec.rb b/spec/apps_spec.rb index fa557a4..3cd668e 100644 --- a/spec/apps_spec.rb +++ b/spec/apps_spec.rb @@ -115,6 +115,51 @@ def check_app_response(app) check_app_response(obj) end end + + it "should not include explicitly filtered-out apps" do + id = App.load_apps[0]['id'] + filter = AppFilter.create(:code => 'abc', :settings => {'app_ids' => {id => false}}) + get '/api/v1/apps?filter=abc' + last_response.should be_ok + json = JSON.parse(last_response.body) + json['objects'].detect{|o| o['id'] == id}.should == nil + end + + it "should include explicitly allowed apps" do + id = App.load_apps[0]['id'] + filter = AppFilter.create(:code => 'abc', :settings => {'app_ids' => {id => true}}) + get '/api/v1/apps?filter=abc' + last_response.should be_ok + json = JSON.parse(last_response.body) + json['objects'].detect{|o| o['id'] == id}.should_not == nil + end + + it "should not include unconfigured apps if not allowed" do + id = App.load_apps[0]['id'] + filter = AppFilter.create(:code => 'abc', :settings => {'app_ids' => {}, 'allow_new' => false}) + get '/api/v1/apps?filter=abc' + last_response.should be_ok + json = JSON.parse(last_response.body) + json['objects'].detect{|o| o['id'] == id}.should == nil + end + + it "should include unconfigured apps if allowed" do + id = App.load_apps[0]['id'] + filter = AppFilter.create(:code => 'abc', :settings => {'app_ids' => {}, 'allow_new' => true}) + get '/api/v1/apps?filter=abc' + last_response.should be_ok + json = JSON.parse(last_response.body) + json['objects'].detect{|o| o['id'] == id}.should_not == nil + end + + it "should include filter on pagination url" do + id = App.load_apps[0]['id'] + filter = AppFilter.create(:code => 'abc', :settings => {'app_ids' => {}, 'allow_new' => true}) + get '/api/v1/apps?filter=abc' + last_response.should be_ok + json = JSON.parse(last_response.body) + json['meta']['next'].should match(/filter=abc/) + end end describe "app details" do @@ -167,6 +212,29 @@ def check_app_response(app) end end + describe "app filter create" do + it "should require a logged-in user" do + post "/api/v1/filter", {} + last_response.should_not be_ok + JSON.parse(last_response.body).should == {'error' => 'Not logged in'} + end + + it "should create filter on success" do + post "/api/v1/filter", {'app_ids' => []}, 'rack.session' => {'user_key' => 'bob'} + last_response.should be_ok + json = JSON.parse(last_response.body) + json['allow_new'].should == false + json['app_ids']['twitter'].should == false + + post "/api/v1/filter", {'app_ids' => ['twitter'], 'allow_new' => '1'}, 'rack.session' => {'user_key' => 'bob'} + last_response.should be_ok + json = JSON.parse(last_response.body) + json['allow_new'].should == true + json['app_ids']['twitter'].should == true + json['app_ids']['youtube'].should == false + end + end + describe "app reviews" do it "should return an empty list if there are no reviews" do AppReview.all.destroy diff --git a/views/filter.erb b/views/filter.erb new file mode 100644 index 0000000..190cd96 --- /dev/null +++ b/views/filter.erb @@ -0,0 +1,77 @@ +
            +

            Filtering

            + +

            + You can create a filter that can be used in the interface and the API to + limit the results returned to only those apps that are explicitly allowed. + To do so, check the apps you'd like to allow and after you save you'll + see notes on how to apply your filter. +

            + <% if @filter %> + You can apply your filter by adding the following code. You can also preview + your filter on + the home page with this link.
            + Code: <%= @filter.code %> + <% end %> +
            +<% if !session['user_key'] %> +
            +
            + You need to be logged in to create/manage a filter. +
            +
            +<% else %> + <% apps = App.load_apps.sort_by{|a| a['name'].downcase }; half = (apps.length / 2.0).ceil %> + <% apps.each {|app| app['checked'] = !@filter || @filter.settings['app_ids'][app['id']] != false || (@filter.settings['allow_new'] && @filter.settings['app_ids'][app['id']] == nil) } %> +
            +
            +
            +
            +
            +
            +
            +
            +
            +

            Allowed Apps

            +
            +
            +
            +
            + <% apps[0, half].each do |app| %> +
            +
            + +
            +
            + <% end %> +
            +
            + +
            +
            +
            +
            + <% apps[half, half].each do |app| %> +
            +
            + +
            +
            + <% end %> +
            +
            +
            +<% end %> + +<% add_script '/filter.js' %> \ No newline at end of file diff --git a/views/index.erb b/views/index.erb index 1152803..6f252ac 100644 --- a/views/index.erb +++ b/views/index.erb @@ -1,12 +1,27 @@
            -

            LTI Apps

            +

            Edu Apps

            - Awesome stuff happens with LTI. You know this is true. Here's a collection of LTI apps you can use in your classes today. + + Welcome to our open collection of learning apps built on LTI™. These apps are all live and can be used in your class today!

            Not familiar with LTI? Basically it's like Facebook apps or Google widgets, but interoperable between lots of edu tools. Browse this site to find tutorials, extensions and other resources. Apps with a gray label under their configuration xml support LTI extensions that won't work in all systems. Currently these LTI extensions are only supported by Canvas.

            NOTE: This site is run by Instructure. The official IMS LTI site is available here. The tools listed on this site should work in most systems.
            -
            +
            +
            + + + + + + + + + + Loading... +
            +
            +<% add_script "index.js" %> \ No newline at end of file diff --git a/views/layout.erb b/views/layout.erb index a551ed1..290f389 100644 --- a/views/layout.erb +++ b/views/layout.erb @@ -1,7 +1,7 @@ - PAGE TITLE + Edu Apps @@ -10,6 +10,10 @@ + <% (@sheets || []).each do |sheet| %> + + <% end %> +