htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply various updates and add reminder for collapse

Browse Source
This commit is contained in:
Sebastian Serth
2020-05-04 16:46:12 +02:00
parent 597f94b3af
commit 2b326b4ff7
5 changed files with 449 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
Gemfile.lock
View File

@ -65,7 +65,7 @@ GEM
tzinfo (~> 1.1)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
amq-protocol (2.3.0)
amq-protocol (2.3.1)
arel (9.0.0)
ast (2.4.0)
autotest (5.0.0)
@ -86,10 +86,10 @@ GEM
bootstrap-will_paginate (1.0.0)
will_paginate
builder (3.2.4)
bunny (2.14.4)
amq-protocol (~> 2.3, >= 2.3.0)
byebug (11.1.1)
capybara (3.31.0)
bunny (2.15.0)
amq-protocol (~> 2.3, >= 2.3.1)
byebug (11.1.3)
capybara (3.32.1)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
@ -111,7 +111,7 @@ GEM
crack (0.4.3)
safe_yaml (~> 1.0.0)
crass (1.0.6)
database_cleaner (1.8.3)
database_cleaner (1.8.4)
debug_inspector (0.0.3)
diff-lcs (1.3)
docile (1.3.2)
@ -130,7 +130,7 @@ GEM
factory_bot_rails (5.2.0)
factory_bot (~> 5.2.0)
railties (>= 4.2.0)
faraday (1.0.0)
faraday (1.0.1)
multipart-post (>= 1.2, < 3)
faye-websocket (0.10.9)
eventmachine (>= 0.12.0)
@ -179,8 +179,8 @@ GEM
method_source (1.0.0)
mime-types (3.3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2019.1009)
mimemagic (0.3.4)
mime-types-data (3.2020.0425)
mimemagic (0.3.5)
mini_magick (4.10.1)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
@ -198,7 +198,7 @@ GEM
multi_xml (0.6.0)
multipart-post (2.1.1)
netrc (0.11.0)
newrelic_rpm (6.9.0.363)
newrelic_rpm (6.10.0.364)
nio4r (2.5.2)
nokogiri (1.10.9)
mini_portile2 (~> 2.4.0)
@ -220,7 +220,7 @@ GEM
pg (1.2.3)
polyamorous (2.3.2)
activerecord (>= 5.2.1)
pry (0.13.0)
pry (0.13.1)
coderay (~> 1.1)
method_source (~> 1.0)
pry-byebug (3.9.0)
@ -228,7 +228,7 @@ GEM
pry (~> 0.13.0)
pry-rails (0.3.9)
pry (>= 0.10.4)
public_suffix (4.0.3)
public_suffix (4.0.4)
puma (4.3.3)
nio4r (~> 2.0)
pundit (2.1.0)
@ -281,7 +281,7 @@ GEM
activesupport (>= 5.2.1)
i18n
polyamorous (= 2.3.2)
rb-fsevent (0.10.3)
rb-fsevent (0.10.4)
rb-inotify (0.10.1)
ffi (~> 1.0)
regexp_parser (1.7.0)
@ -299,8 +299,8 @@ GEM
rspec-core (>= 2.99.0.beta1, < 4.0.0)
rspec-collection_matchers (1.2.0)
rspec-expectations (>= 2.99.0.beta1)
rspec-core (3.9.1)
rspec-support (~> 3.9.1)
rspec-core (3.9.2)
rspec-support (~> 3.9.3)
rspec-expectations (3.9.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
@ -315,15 +315,15 @@ GEM
rspec-expectations (~> 3.9)
rspec-mocks (~> 3.9)
rspec-support (~> 3.9)
rspec-support (3.9.2)
rubocop (0.80.1)
rspec-support (3.9.3)
rubocop (0.82.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.7.0.1)
rainbow (>= 2.2.2, < 4.0)
rexml
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.7)
unicode-display_width (>= 1.4.0, < 2.0)
rubocop-rspec (1.39.0)
rubocop (>= 0.68.1)
ruby-progressbar (1.10.1)
@ -336,7 +336,7 @@ GEM
safe_yaml (1.0.5)
sass-rails (6.0.0)
sassc-rails (~> 2.1, >= 2.1.1)
sassc (2.2.1)
sassc (2.3.0)
ffi (~> 1.9)
sassc-rails (2.1.2)
railties (>= 4.0.0)
@ -347,6 +347,7 @@ GEM
selenium-webdriver (3.142.7)
childprocess (>= 0.5, < 4.0)
rubyzip (>= 1.2.2)
semantic_range (2.3.0)
sentry-raven (3.0.0)
faraday (>= 1.0)
shoulda-matchers (4.3.0)
@ -362,7 +363,7 @@ GEM
actionpack (>= 3.1)
railties (>= 3.1)
slim (>= 3.0, < 5.0)
sorcery (0.14.0)
sorcery (0.15.0)
bcrypt (~> 3.1)
oauth (~> 0.4, >= 0.4.4)
oauth2 (~> 1.0, >= 0.8.0)
@ -388,8 +389,8 @@ GEM
execjs (>= 0.3.0, < 3)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.6)
unicode-display_width (1.6.1)
unf_ext (0.0.7.7)
unicode-display_width (1.7.0)
web-console (3.7.0)
actionview (>= 5.0)
activemodel (>= 5.0)
@ -399,10 +400,11 @@ GEM
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
webpacker (4.2.2)
activesupport (>= 4.2)
webpacker (5.1.1)
activesupport (>= 5.2)
rack-proxy (>= 0.6.1)
railties (>= 4.2)
railties (>= 5.2)
semantic_range (>= 2.3.0)
websocket (1.2.8)
websocket-driver (0.7.1)
websocket-extensions (>= 0.1.0)
@ -484,3 +486,6 @@ DEPENDENCIES
webmock
webpacker
whenever
BUNDLED WITH
2.1.4

3
app/views/exercises/_file_form.html.slim
View File

@ -11,7 +11,8 @@ li.card.mt-2
span = f.object.name_with_extension
- else
span = f.object.name
.card-collapse.collapse class=('in' if f.object.name.nil?) id="collapse#{f.index}" role="tabpanel"
// FIXME: Re-add .collapse
.card-collapse class=('in' if f.object.name.nil?) id="collapse#{f.index}" role="tabpanel"
.card-body
- if policy(f.object).destroy? && id.present?
.clearfix

3
app/views/exercises/show.html.slim
View File

@ -36,7 +36,8 @@ ul.list-unstyled#files
div.clearfix role="button"
i class="fa" aria-hidden="true"
span = file.name_with_extension
.card-collapse.collapse class="collapse#{file.id}" role="tabpanel"
// FIXME: Re-add .collapse
.card-collapse class="collapse#{file.id}" role="tabpanel"
.card-body
- if policy(file).destroy?
.clearfix = link_to(t('shared.destroy'), file, class:'btn btn-warning btn-sm float-right', data: {confirm: t('shared.confirm_destroy')}, method: :delete)

14
package.json
View File

@ -1,25 +1,25 @@
{
"dependencies": {
"@fortawesome/fontawesome-free": "^5.13.0",
"@rails/webpacker": "5.0",
"@rails/webpacker": "^5.1.1",
"@sentry/browser": "^5.15.5",
"bootstrap": "^4.1.3",
"bootstrap": "^4.4.1",
"bootswatch": "^4.4.1",
"chosen-js": "^1.8.7",
"d3": "^5.16.0",
"d3-tip": "^0.9.1",
"highlight.js": "^9.18.0",
"highlight.js": "^10.0.2",
"jquery": "^3.5.0",
"jquery-ui": "^1.12.1",
"jstree": "^3.3.9",
"opensans-webkit": "^1.0.1",
"opensans-webkit": "^1.1.0",
"popper.js": "^1.16.1",
"underscore": "^1.9.2",
"underscore": "^1.10.2",
"vis": "^4.21.0",
"webpack-merge": "^4.1.4"
"webpack-merge": "^4.2.2"
},
"devDependencies": {
"webpack-dev-server": "3.10.3"
"webpack-dev-server": "^3.10.3"
},
"scripts": {
"webpack": "./bin/webpack",

815
yarn.lock
View File

File diff suppressed because it is too large Load Diff