From cb2cd90fb08afacc0ef08f4fef46df3597016c94 Mon Sep 17 00:00:00 2001 From: Hauke Klement Date: Sat, 7 Mar 2015 15:57:17 +0100 Subject: [PATCH] added Flowr configuration --- .travis.yml | 1 + app/assets/javascripts/editor.js | 10 +++++++--- app/views/exercises/implement.html.slim | 9 ++++----- config/code_ocean.yml.example | 14 ++++++++++++++ config/code_ocean.yml.travis | 3 +++ config/deploy.rb | 2 +- 6 files changed, 30 insertions(+), 9 deletions(-) create mode 100644 config/code_ocean.yml.example create mode 100644 config/code_ocean.yml.travis diff --git a/.travis.yml b/.travis.yml index 61b2c24a..78d878ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ before_install: before_script: - cp .rspec.travis .rspec - cp config/action_mailer.yml.travis config/action_mailer.yml + - cp config/code_ocean.yml.travis config/code_ocean.yml - cp config/database.yml.travis config/database.yml - cp config/secrets.yml.travis config/secrets.yml - psql --command='CREATE DATABASE travis_ci_test;' --username=postgres diff --git a/app/assets/javascripts/editor.js b/app/assets/javascripts/editor.js index 0a45a7cf..e650a0e8 100644 --- a/app/assets/javascripts/editor.js +++ b/app/assets/javascripts/editor.js @@ -17,7 +17,6 @@ $(function() { var active_frame; var running = false; - var flowrUrl = 'http://vm-teusner-webrtc.eaalab.hpi.uni-potsdam.de:3000/api/exceptioninfo?id=&lang=auto'; var flowrResultHtml = '
'; var ajax = function(options) { @@ -133,8 +132,12 @@ $(function() { event_source.addEventListener('info', storeContainerInformation); event_source.addEventListener('output', callback); event_source.addEventListener('start', callback); - event_source.addEventListener('output', handleStderrOutputForFlowr); - event_source.addEventListener('close', handleStderrOutputForFlowr); + + if ($('#flowrHint').isPresent()) { + event_source.addEventListener('output', handleStderrOutputForFlowr); + event_source.addEventListener('close', handleStderrOutputForFlowr); + } + event_source.addEventListener('status', function(event) { showStatus(JSON.parse(event.data)); }); @@ -616,6 +619,7 @@ $(function() { var stderrOutput = ''; var handleStderrOutputForFlowr = function(event) { + var flowrUrl = $('#flowrHint').data('url'); var json = JSON.parse(event.data); if (json.stderr) { diff --git a/app/views/exercises/implement.html.slim b/app/views/exercises/implement.html.slim index 30bbefd6..0ee7fa22 100644 --- a/app/views/exercises/implement.html.slim +++ b/app/views/exercises/implement.html.slim @@ -40,11 +40,10 @@ hr .panel-body #output pre = t('.no_output_yet') - - #flowrHint.panel.panel-info(role='tab') - .panel-heading = 'Gain more insights here' - .panel-body - + - if CodeOcean::Config.new(:code_ocean).read[:flowr][:enabled] + #flowrHint.panel.panel-info data-url=CodeOcean::Config.new(:code_ocean).read[:flowr][:url] role='tab' + .panel-heading = 'Gain more insights here' + .panel-body #progress.tab-pane #results h2 = t('.results') diff --git a/config/code_ocean.yml.example b/config/code_ocean.yml.example new file mode 100644 index 00000000..d71d4d06 --- /dev/null +++ b/config/code_ocean.yml.example @@ -0,0 +1,14 @@ +default: &default + flowr: + enabled: false + +development: + flowr: + enabled: true + url: http://example.org:3000/api/exceptioninfo?id=&lang=auto + +production: + <<: *default + +test: + <<: *default diff --git a/config/code_ocean.yml.travis b/config/code_ocean.yml.travis new file mode 100644 index 00000000..e093289f --- /dev/null +++ b/config/code_ocean.yml.travis @@ -0,0 +1,3 @@ +test: + flowr: + enabled: false diff --git a/config/deploy.rb b/config/deploy.rb index af5ded9e..06d8088d 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -3,7 +3,7 @@ set :config_example_suffix, '.example' set :deploy_to, '/var/www/app' set :keep_releases, 3 set :linked_dirs, %w(bin log public/uploads tmp/cache tmp/files tmp/pids tmp/sockets) -set :linked_files, %w(config/action_mailer.yml config/database.yml config/secrets.yml config/sendmail.yml config/smtp.yml) +set :linked_files, %w(config/action_mailer.yml config/code_ocean.yml config/database.yml config/secrets.yml config/sendmail.yml config/smtp.yml) set :log_level, :info set :puma_threads, [0, 16] set :repo_url, 'git@github.com:openHPI/codeocean.git'